diff options
author | jrizzoli <joey@cyanogenmoditalia.it> | 2015-11-05 14:24:50 +0100 |
---|---|---|
committer | jrizzoli <joey@cyanogenmoditalia.it> | 2015-11-05 14:24:50 +0100 |
commit | 13fca8d729e188ca71802408b095d256a499a750 (patch) | |
tree | 71db2668cefc0b9aa803289390f1a884a6447f74 /channels/cm | |
parent | f63f311e2ce4c7986404d343bec777f32e40a04e (diff) | |
download | android_packages_apps_Gello-13fca8d729e188ca71802408b095d256a499a750.tar.gz android_packages_apps_Gello-13fca8d729e188ca71802408b095d256a499a750.tar.bz2 android_packages_apps_Gello-13fca8d729e188ca71802408b095d256a499a750.zip |
gello: fix mismerge
Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>
Diffstat (limited to 'channels/cm')
-rw-r--r-- | channels/cm/branding/BRANDING | 10 | ||||
-rw-r--r-- | channels/cm/res/mipmap-hdpi/ic_launcher_browser.png | bin | 0 -> 4272 bytes | |||
-rw-r--r-- | channels/cm/res/mipmap-mdpi/ic_launcher_browser.png | bin | 0 -> 2620 bytes | |||
-rw-r--r-- | channels/cm/res/mipmap-xhdpi/ic_launcher_browser.png | bin | 0 -> 6034 bytes | |||
-rw-r--r-- | channels/cm/res/mipmap-xxhdpi/ic_launcher_browser.png | bin | 0 -> 9727 bytes | |||
-rw-r--r-- | channels/cm/res/mipmap-xxxhdpi/ic_launcher_browser.png | bin | 0 -> 13667 bytes |
6 files changed, 10 insertions, 0 deletions
diff --git a/channels/cm/branding/BRANDING b/channels/cm/branding/BRANDING new file mode 100644 index 00000000..757d7edb --- /dev/null +++ b/channels/cm/branding/BRANDING @@ -0,0 +1,10 @@ +COMPANY_FULLNAME=The CyanogenMod Project +COMPANY_SHORTNAME=The CyanogenMod Project +PRODUCT_FULLNAME=CyanogenMod +PRODUCT_SHORTNAME=CM +PRODUCT_INSTALLER_FULLNAME=CM Installer +PRODUCT_INSTALLER_SHORTNAME=CM Installer +COPYRIGHT=Copyright (c) 2015 The CyanogenMod Project. All rights reserved. +PACKAGE_NAME=org.cyanogenmod.gello.browser +APK_LABEL=@string/application_name +APK_AUTHORITIES=cyanogenmod.browser diff --git a/channels/cm/res/mipmap-hdpi/ic_launcher_browser.png b/channels/cm/res/mipmap-hdpi/ic_launcher_browser.png Binary files differnew file mode 100644 index 00000000..5cb9cf89 --- /dev/null +++ b/channels/cm/res/mipmap-hdpi/ic_launcher_browser.png diff --git a/channels/cm/res/mipmap-mdpi/ic_launcher_browser.png b/channels/cm/res/mipmap-mdpi/ic_launcher_browser.png Binary files differnew file mode 100644 index 00000000..d19c7e86 --- /dev/null +++ b/channels/cm/res/mipmap-mdpi/ic_launcher_browser.png diff --git a/channels/cm/res/mipmap-xhdpi/ic_launcher_browser.png b/channels/cm/res/mipmap-xhdpi/ic_launcher_browser.png Binary files differnew file mode 100644 index 00000000..1222762a --- /dev/null +++ b/channels/cm/res/mipmap-xhdpi/ic_launcher_browser.png diff --git a/channels/cm/res/mipmap-xxhdpi/ic_launcher_browser.png b/channels/cm/res/mipmap-xxhdpi/ic_launcher_browser.png Binary files differnew file mode 100644 index 00000000..45e93528 --- /dev/null +++ b/channels/cm/res/mipmap-xxhdpi/ic_launcher_browser.png diff --git a/channels/cm/res/mipmap-xxxhdpi/ic_launcher_browser.png b/channels/cm/res/mipmap-xxxhdpi/ic_launcher_browser.png Binary files differnew file mode 100644 index 00000000..e23deeb3 --- /dev/null +++ b/channels/cm/res/mipmap-xxxhdpi/ic_launcher_browser.png |