diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-23 21:24:37 -0700 |
|---|---|---|
| committer | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-23 21:24:37 -0700 |
| commit | 0c0d54637af7109ae22e21a117dba3efdaded4b5 (patch) | |
| tree | fe9ed94353b09dda232fceb64691f96dcd5db8d3 /WallpaperPicker/res/drawable-xxhdpi/ic_images.png | |
| parent | cf51139c6e1d57b57177109f2177edc41edf5bbc (diff) | |
| parent | 13ef17a37e683b8ad5800e9f542b411180fbec2f (diff) | |
| download | android_packages_apps_Trebuchet-0c0d54637af7109ae22e21a117dba3efdaded4b5.tar.gz android_packages_apps_Trebuchet-0c0d54637af7109ae22e21a117dba3efdaded4b5.tar.bz2 android_packages_apps_Trebuchet-0c0d54637af7109ae22e21a117dba3efdaded4b5.zip | |
resolved conflicts for merge of 13ef17a3 to mnc-ub-dev
b/22609402
Change-Id: I80699d985088b9b79211284e710e8a6b8b90860b
Diffstat (limited to 'WallpaperPicker/res/drawable-xxhdpi/ic_images.png')
| -rw-r--r-- | WallpaperPicker/res/drawable-xxhdpi/ic_images.png | bin | 2097 -> 621 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/WallpaperPicker/res/drawable-xxhdpi/ic_images.png b/WallpaperPicker/res/drawable-xxhdpi/ic_images.png Binary files differindex d00db9a00..c8b9f757a 100644 --- a/WallpaperPicker/res/drawable-xxhdpi/ic_images.png +++ b/WallpaperPicker/res/drawable-xxhdpi/ic_images.png |
