diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2017-05-25 10:05:45 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2017-05-25 10:05:45 -0700 |
| commit | b7484f9381a63144f8359b59863493cd469ba417 (patch) | |
| tree | 03f49d106c24a2774be4e78966bd2bd8a2c9f85e /res/values-gu | |
| parent | fc7c52ecc3ae2ec90dba29078ef35499e2cfa387 (diff) | |
| parent | 9d9dbcb1b80017f547b07bcd80de79a298bd80f6 (diff) | |
| download | android_packages_apps_Trebuchet-b7484f9381a63144f8359b59863493cd469ba417.tar.gz android_packages_apps_Trebuchet-b7484f9381a63144f8359b59863493cd469ba417.tar.bz2 android_packages_apps_Trebuchet-b7484f9381a63144f8359b59863493cd469ba417.zip | |
resolve merge conflicts of 9d9dbcb1b to ub-launcher3-master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9978124fb3c24bb497cac0d199c0b5dcdc670715
Diffstat (limited to 'res/values-gu')
| -rw-r--r-- | res/values-gu/config.xml | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/res/values-gu/config.xml b/res/values-gu/config.xml deleted file mode 100644 index 7ee78d01b..000000000 --- a/res/values-gu/config.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string-array name="icon_shape_override_paths_values"> - <item msgid="6640290598899495380"></item> - <item msgid="4009824731445917273">"M50,0L100,0 100,100 0,100 0,0z"</item> - <item msgid="1832340187106991439">"M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z"</item> - <item msgid="8549745892733419075">"M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0"</item> - <item msgid="7298209005825805703">"M50,0A50,50,0,0 1 100,50 L100,85 A15,15,0,0 1 85,100 L50,100 A50,50,0,0 1 50,0z"</item> - </string-array> - <!-- no translation found for icon_shape_override_paths_names:0 (4837899951986816538) --> -</resources> |