From e612775922ec9f8cc4e5cb976bc62b3312a3de0e Mon Sep 17 00:00:00 2001 From: Hyunyoung Song Date: Tue, 21 Jul 2015 17:01:26 -0700 Subject: resolved conflicts for merge of 13ef17a3 to mnc-dr-dev b/22609402 Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b --- WallpaperPicker/res/drawable-hdpi/ic_images.png | Bin 1935 -> 354 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'WallpaperPicker/res/drawable-hdpi') diff --git a/WallpaperPicker/res/drawable-hdpi/ic_images.png b/WallpaperPicker/res/drawable-hdpi/ic_images.png index 0003c6c65..15e511c89 100644 Binary files a/WallpaperPicker/res/drawable-hdpi/ic_images.png and b/WallpaperPicker/res/drawable-hdpi/ic_images.png differ -- cgit v1.2.3