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 --- res/drawable-mdpi/portal_container_holo.9.png | Bin 843 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 res/drawable-mdpi/portal_container_holo.9.png (limited to 'res/drawable-mdpi/portal_container_holo.9.png') diff --git a/res/drawable-mdpi/portal_container_holo.9.png b/res/drawable-mdpi/portal_container_holo.9.png deleted file mode 100644 index 1e4afae76..000000000 Binary files a/res/drawable-mdpi/portal_container_holo.9.png and /dev/null differ -- cgit v1.2.3