Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2028)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/android/java_staging/res_default/values/channel_constants.xml

Issue 1141283003: Upstream oodles of Chrome for Android code into Chromium. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: final patch? Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/android/java_staging/res_default/mipmap-xxxhdpi/app_shortcut_icon.png ('k') | chrome/android/java_staging/res_template/xml/searchable.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java_staging/res_default/values/channel_constants.xml
diff --git a/third_party/android_data_chart/java/res/values/values.xml b/chrome/android/java_staging/res_default/values/channel_constants.xml
similarity index 53%
copy from third_party/android_data_chart/java/res/values/values.xml
copy to chrome/android/java_staging/res_default/values/channel_constants.xml
index c33ec5b3ed986dde13187120e4cb2414ed8e60f8..e19405f30b071f1180b87c7416553d262140c140 100644
--- a/third_party/android_data_chart/java/res/values/values.xml
+++ b/chrome/android/java_staging/res_default/values/channel_constants.xml
@@ -3,7 +3,7 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
-<resources>
- <item type="id" name="compressed_series" />
- <item type="id" name="original_series" />
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+ <!-- The application name displayed to the user. -->
+ <string name="app_name" translatable="false">Chromium</string>
</resources>
« no previous file with comments | « chrome/android/java_staging/res_default/mipmap-xxxhdpi/app_shortcut_icon.png ('k') | chrome/android/java_staging/res_template/xml/searchable.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698