diff options
author | Steve Kondik <shade@chemlab.org> | 2013-02-15 14:45:54 -0800 |
---|---|---|
committer | Steve Kondik <shade@chemlab.org> | 2013-02-15 14:45:54 -0800 |
commit | ed1816e3a828046439da5cb31a65af4641be9076 (patch) | |
tree | 994e4ed51b3e1630e338b3ec255a8f4dce429953 /res/mipmap-hdpi | |
parent | c43d6eebe95dcabcb4ded1c4da8c6cc21d2514f5 (diff) | |
parent | 002c25eede2a33a5378c16c5bb9165179783e729 (diff) | |
download | packages_apps_trebuchet-ed1816e3a828046439da5cb31a65af4641be9076.zip packages_apps_trebuchet-ed1816e3a828046439da5cb31a65af4641be9076.tar.gz packages_apps_trebuchet-ed1816e3a828046439da5cb31a65af4641be9076.tar.bz2 |
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/Launcher2 into treb
Android 4.2.2 release 1
Conflicts:
res/layout-land/launcher.xml
res/layout-port/launcher.xml
res/layout-sw720dp/launcher.xml
src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java
src/com/cyanogenmod/trebuchet/AppsCustomizeTabHost.java
src/com/cyanogenmod/trebuchet/CellLayout.java
src/com/cyanogenmod/trebuchet/Launcher.java
src/com/cyanogenmod/trebuchet/PagedView.java
Change-Id: I415138430337bcd21070b815a80de9c0cdd52239
Diffstat (limited to 'res/mipmap-hdpi')
-rwxr-xr-x | res/mipmap-hdpi/ic_launcher_home.png | bin | 0 -> 23597 bytes |
-rw-r--r-- | res/mipmap-hdpi/ic_launcher_wallpaper.png | bin | 0 -> 4418 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/res/mipmap-hdpi/ic_launcher_home.png b/res/mipmap-hdpi/ic_launcher_home.png Binary files differnew file mode 100755 index 0000000..33d36b0 --- /dev/null +++ b/res/mipmap-hdpi/ic_launcher_home.png diff --git a/res/mipmap-hdpi/ic_launcher_wallpaper.png b/res/mipmap-hdpi/ic_launcher_wallpaper.png Binary files differnew file mode 100644 index 0000000..affee85 --- /dev/null +++ b/res/mipmap-hdpi/ic_launcher_wallpaper.png |