diff options
| author | Evan Charlton <evanc@google.com> | 2014-05-14 11:08:04 -0700 |
|---|---|---|
| committer | Evan Charlton <evanc@google.com> | 2014-05-14 11:16:26 -0700 |
| commit | bbec33053cc35ad5af0fa48d9e8f77644433be6f (patch) | |
| tree | 841f4494ee4d2e32a6a064caa29e5bd0636524c3 /InCallUI/res/drawable-hdpi | |
| parent | 486407a63a0570a4fa2e93603100db30664441db (diff) | |
| parent | 4d611662e17878203be2770142409829c1a2d4e4 (diff) | |
resolved conflicts for merge of 500e399c to master
Change-Id: I7cc16e713bb142450c7689942097110bde404b54
Diffstat (limited to 'InCallUI/res/drawable-hdpi')
| -rw-r--r-- | InCallUI/res/drawable-hdpi/ic_in_call_video_handoff.png | bin | 1857 -> 0 bytes |
| -rw-r--r-- | InCallUI/res/drawable-hdpi/ic_in_call_wifi.png | bin | 1789 -> 0 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/InCallUI/res/drawable-hdpi/ic_in_call_video_handoff.png b/InCallUI/res/drawable-hdpi/ic_in_call_video_handoff.png Binary files differdeleted file mode 100644 index fb76e3c69..000000000 --- a/InCallUI/res/drawable-hdpi/ic_in_call_video_handoff.png +++ /dev/null diff --git a/InCallUI/res/drawable-hdpi/ic_in_call_wifi.png b/InCallUI/res/drawable-hdpi/ic_in_call_wifi.png Binary files differdeleted file mode 100644 index 93e086dab..000000000 --- a/InCallUI/res/drawable-hdpi/ic_in_call_wifi.png +++ /dev/null |
