diff options
| author | Winson <winsonc@google.com> | 2015-09-09 17:11:29 -0700 |
|---|---|---|
| committer | Winson <winsonc@google.com> | 2015-09-09 17:11:29 -0700 |
| commit | b9cc38031c1c844af13f63ef4cf37211595835b6 (patch) | |
| tree | 7709815140dee589113d284e4fdc5b1e3efbfaad /res/drawable-xhdpi/ic_all_apps_bg_icon_2.png | |
| parent | 1c3dc4cf4de404f76dbefc57e86b66121149e6e3 (diff) | |
| parent | 1268855200e519985e2c845ba84d2d613fa4a36c (diff) | |
| download | android_packages_apps_Trebuchet-b9cc38031c1c844af13f63ef4cf37211595835b6.tar.gz android_packages_apps_Trebuchet-b9cc38031c1c844af13f63ef4cf37211595835b6.tar.bz2 android_packages_apps_Trebuchet-b9cc38031c1c844af13f63ef4cf37211595835b6.zip | |
resolved conflicts for 12688552 to ub-launcher3-master
Change-Id: Iaf97c5ae486e19cd3ad320ed88346571252d878a
Diffstat (limited to 'res/drawable-xhdpi/ic_all_apps_bg_icon_2.png')
| -rw-r--r-- | res/drawable-xhdpi/ic_all_apps_bg_icon_2.png | bin | 5482 -> 3441 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/res/drawable-xhdpi/ic_all_apps_bg_icon_2.png b/res/drawable-xhdpi/ic_all_apps_bg_icon_2.png Binary files differindex fb0795662..71cf250ee 100644 --- a/res/drawable-xhdpi/ic_all_apps_bg_icon_2.png +++ b/res/drawable-xhdpi/ic_all_apps_bg_icon_2.png |
