diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-15 11:54:10 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-15 11:54:10 +0100 |
| commit | 60e5a34630c69e575f157a2babac70048cc3bdb1 (patch) | |
| tree | 9691d92caa5fba82bf307cf2af3374c616053bb8 /DeviceSettings/res/drawable/ic_launcher_cmdevicesettings.png | |
| parent | 8d57bd027ab7f354e1707510d3ba5654ba16c0aa (diff) | |
| parent | 02a3b7b2c85b056f6172668ac9d2008a941a6df5 (diff) | |
| download | device_samsung_smdk4412-common-60e5a34630c69e575f157a2babac70048cc3bdb1.zip device_samsung_smdk4412-common-60e5a34630c69e575f157a2babac70048cc3bdb1.tar.gz device_samsung_smdk4412-common-60e5a34630c69e575f157a2babac70048cc3bdb1.tar.bz2 | |
Merge remote-tracking branch 'github/cm-13.0' into replicant-6.0
Conflicts:
BoardCommonConfig.mk
camera/Android.mk
common.mk
configs/80cfw
lpm.rc
overlay/frameworks/base/core/res/res/values/config.xml
overlay/packages/apps/Camera2/res/values/config.xml
Diffstat (limited to 'DeviceSettings/res/drawable/ic_launcher_cmdevicesettings.png')
| -rwxr-xr-x | DeviceSettings/res/drawable/ic_launcher_cmdevicesettings.png | bin | 8207 -> 0 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/DeviceSettings/res/drawable/ic_launcher_cmdevicesettings.png b/DeviceSettings/res/drawable/ic_launcher_cmdevicesettings.png Binary files differdeleted file mode 100755 index 66de9c3..0000000 --- a/DeviceSettings/res/drawable/ic_launcher_cmdevicesettings.png +++ /dev/null |
