commit 09168a9f3dd29f38d82b852dced6c8b42b9c85b9
author Sunny Goyal <sunnygoyal@google.com> Wed Apr 06 19:39:57 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 06 19:39:57 2016 +0000
tree 9c297e58eb231f5a2b7ba0164195aaa33a343acb
parent c79e640b5c4aa1cc7a183d2bb144c0b60dd43d64
parent 4a754f821bf1cf4434ee48a2783d79b421bda837

Merge "Deleting resources added due to merge conflicts" into ub-launcher3-calgary
am: 4a754f8

* commit '4a754f821bf1cf4434ee48a2783d79b421bda837':
  Deleting resources added due to merge conflicts

Change-Id: If24fd61b906d000e2a816de594c884a733423f16

res/drawable-hdpi/ic_setting_pressed.png

diff --git a/res/drawable-hdpi/ic_setting_pressed.png b/res/drawable-hdpi/ic_setting_pressed.png
deleted file mode 100644
index b86fce1..0000000
--- a/res/drawable-hdpi/ic_setting_pressed.png
+++ /dev/null
Binary files differ

res/drawable-hdpi/ic_wallpaper_pressed.png

diff --git a/res/drawable-hdpi/ic_wallpaper_pressed.png b/res/drawable-hdpi/ic_wallpaper_pressed.png
deleted file mode 100644
index 4bb1958..0000000
--- a/res/drawable-hdpi/ic_wallpaper_pressed.png
+++ /dev/null
Binary files differ

res/drawable-hdpi/ic_widget_pressed.png

diff --git a/res/drawable-hdpi/ic_widget_pressed.png b/res/drawable-hdpi/ic_widget_pressed.png
deleted file mode 100644
index 7f31ab3..0000000
--- a/res/drawable-hdpi/ic_widget_pressed.png
+++ /dev/null
Binary files differ

res/drawable-mdpi/ic_setting_pressed.png

diff --git a/res/drawable-mdpi/ic_setting_pressed.png b/res/drawable-mdpi/ic_setting_pressed.png
deleted file mode 100644
index 018bea3..0000000
--- a/res/drawable-mdpi/ic_setting_pressed.png
+++ /dev/null
Binary files differ

res/drawable-mdpi/ic_wallpaper_pressed.png

diff --git a/res/drawable-mdpi/ic_wallpaper_pressed.png b/res/drawable-mdpi/ic_wallpaper_pressed.png
deleted file mode 100644
index 08794d9..0000000
--- a/res/drawable-mdpi/ic_wallpaper_pressed.png
+++ /dev/null
Binary files differ

res/drawable-mdpi/ic_widget_pressed.png

diff --git a/res/drawable-mdpi/ic_widget_pressed.png b/res/drawable-mdpi/ic_widget_pressed.png
deleted file mode 100644
index 634b415..0000000
--- a/res/drawable-mdpi/ic_widget_pressed.png
+++ /dev/null
Binary files differ

res/drawable-xhdpi/ic_setting_pressed.png

diff --git a/res/drawable-xhdpi/ic_setting_pressed.png b/res/drawable-xhdpi/ic_setting_pressed.png
deleted file mode 100644
index 949373f..0000000
--- a/res/drawable-xhdpi/ic_setting_pressed.png
+++ /dev/null
Binary files differ

res/drawable-xhdpi/ic_wallpaper_pressed.png

diff --git a/res/drawable-xhdpi/ic_wallpaper_pressed.png b/res/drawable-xhdpi/ic_wallpaper_pressed.png
deleted file mode 100644
index e1e291d..0000000
--- a/res/drawable-xhdpi/ic_wallpaper_pressed.png
+++ /dev/null
Binary files differ

res/drawable-xhdpi/ic_widget_pressed.png

diff --git a/res/drawable-xhdpi/ic_widget_pressed.png b/res/drawable-xhdpi/ic_widget_pressed.png
deleted file mode 100644
index 1dcaf37..0000000
--- a/res/drawable-xhdpi/ic_widget_pressed.png
+++ /dev/null
Binary files differ

res/drawable-xxhdpi/ic_setting_pressed.png

diff --git a/res/drawable-xxhdpi/ic_setting_pressed.png b/res/drawable-xxhdpi/ic_setting_pressed.png
deleted file mode 100644
index d78cad6..0000000
--- a/res/drawable-xxhdpi/ic_setting_pressed.png
+++ /dev/null
Binary files differ

res/drawable-xxhdpi/ic_wallpaper_pressed.png

diff --git a/res/drawable-xxhdpi/ic_wallpaper_pressed.png b/res/drawable-xxhdpi/ic_wallpaper_pressed.png
deleted file mode 100644
index 52c92cb..0000000
--- a/res/drawable-xxhdpi/ic_wallpaper_pressed.png
+++ /dev/null
Binary files differ

res/drawable-xxhdpi/ic_widget_pressed.png

diff --git a/res/drawable-xxhdpi/ic_widget_pressed.png b/res/drawable-xxhdpi/ic_widget_pressed.png
deleted file mode 100644
index 0c9b02a..0000000
--- a/res/drawable-xxhdpi/ic_widget_pressed.png
+++ /dev/null
Binary files differ