From e760e4204887acd9fb6e4b8b00059659a1367c3b Mon Sep 17 00:00:00 2001 From: calderwoodra Date: Thu, 15 Mar 2018 15:56:30 -0700 Subject: Resolve all build resource conflicts. For simplicity, instead of resolve the nui shortcut string, I deleted it since it isn't used anymore. Test: build log PiperOrigin-RevId: 189260472 Change-Id: I67d5a49d78916a8960e41ad1c7b7f59efad6d718 --- .../android/dialer/app/res/drawable-xxhdpi/ic_handle.png | Bin 1431 -> 0 bytes .../dialer/app/res/drawable-xxhdpi/old_ic_handle.png | Bin 0 -> 1431 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 java/com/android/dialer/app/res/drawable-xxhdpi/ic_handle.png create mode 100644 java/com/android/dialer/app/res/drawable-xxhdpi/old_ic_handle.png (limited to 'java/com/android/dialer/app/res/drawable-xxhdpi') diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_handle.png b/java/com/android/dialer/app/res/drawable-xxhdpi/ic_handle.png deleted file mode 100644 index d07a1d057..000000000 Binary files a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_handle.png and /dev/null differ diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/old_ic_handle.png b/java/com/android/dialer/app/res/drawable-xxhdpi/old_ic_handle.png new file mode 100644 index 000000000..d07a1d057 Binary files /dev/null and b/java/com/android/dialer/app/res/drawable-xxhdpi/old_ic_handle.png differ -- cgit v1.2.3