diff options
| author | Andrew Lee <anwlee@google.com> | 2014-05-09 15:39:52 -0700 |
|---|---|---|
| committer | Andrew Lee <anwlee@google.com> | 2014-05-09 15:39:52 -0700 |
| commit | ff8200e38955212da5fa20a7d3b28eece5a34073 (patch) | |
| tree | 6e1bb7e4322d04e17954efa59c1efbf2866e3d0f /InCallUI/res/drawable-xxhdpi | |
| parent | f62fe2b612e643f2ceef67a5cb5693feaa1376e9 (diff) | |
| parent | 56021c74461fef9783cfc853afdac96e7b7a3bdf (diff) | |
resolved conflicts for merge of d5557cb1 to master-nova
Change-Id: I6c9d594781d9d8de830104b1e038d381aacbc969
Diffstat (limited to 'InCallUI/res/drawable-xxhdpi')
| -rw-r--r-- | InCallUI/res/drawable-xxhdpi/fab_ic_end_call.png | bin | 0 -> 2227 bytes |
| -rw-r--r-- | InCallUI/res/drawable-xxhdpi/fab_red_background.png | bin | 0 -> 5545 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/InCallUI/res/drawable-xxhdpi/fab_ic_end_call.png b/InCallUI/res/drawable-xxhdpi/fab_ic_end_call.png Binary files differnew file mode 100644 index 000000000..37e826402 --- /dev/null +++ b/InCallUI/res/drawable-xxhdpi/fab_ic_end_call.png diff --git a/InCallUI/res/drawable-xxhdpi/fab_red_background.png b/InCallUI/res/drawable-xxhdpi/fab_red_background.png Binary files differnew file mode 100644 index 000000000..46afeac10 --- /dev/null +++ b/InCallUI/res/drawable-xxhdpi/fab_red_background.png |
