diff options
author | Kenny Root <kroot@google.com> | 2013-10-01 22:15:39 -0700 |
---|---|---|
committer | Kenny Root <kroot@google.com> | 2013-10-01 22:15:39 -0700 |
commit | 20088113f71d78adf16c777aaa80714fbbcaa2da (patch) | |
tree | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 /res/drawable-xhdpi/ic_incoming_call_bluetooth.png | |
parent | d5f1eb9cd700226bb2f90a5f0abdfac73b875f04 (diff) | |
parent | 1ac20c8a533794c29928d77b2d9d434960f38e8d (diff) | |
download | Phone-20088113f71d78adf16c777aaa80714fbbcaa2da.tar.gz |
resolved conflicts for merge of 1ac20c8a to klp-dev-plus-aosp
Change-Id: If7795db5d4b41f8857241c51fa06a6ae1df1b3ad
Diffstat (limited to 'res/drawable-xhdpi/ic_incoming_call_bluetooth.png')
-rw-r--r-- | res/drawable-xhdpi/ic_incoming_call_bluetooth.png | bin | 5919 -> 0 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/res/drawable-xhdpi/ic_incoming_call_bluetooth.png b/res/drawable-xhdpi/ic_incoming_call_bluetooth.png Binary files differdeleted file mode 100644 index 662e7bb6..00000000 --- a/res/drawable-xhdpi/ic_incoming_call_bluetooth.png +++ /dev/null |