diff options
| author | Andrew Lee <anwlee@google.com> | 2014-06-11 10:26:49 -0700 |
|---|---|---|
| committer | Andrew Lee <anwlee@google.com> | 2014-06-11 10:26:49 -0700 |
| commit | 8466615413eb7d0feb23ab33288caac104dfd41e (patch) | |
| tree | cf5844135f19920c3e6611700e2b5c8d435df12c /res/drawable-mdpi | |
| parent | 2bd4f7a892e22d41f4055027c7f0b21b3b4db03b (diff) | |
| parent | 0a4327e6bfeedc23ddefb4df9f6e8041ebc87b59 (diff) | |
resolved conflicts for merge of 0a4327e6 to master
Change-Id: I98b24e23d9d3283223f8db0c58930977b7a8fd35
Diffstat (limited to 'res/drawable-mdpi')
| -rw-r--r-- | res/drawable-mdpi/empty_call_log.png | bin | 0 -> 2463 bytes |
| -rw-r--r-- | res/drawable-mdpi/empty_contacts.png | bin | 0 -> 1778 bytes |
| -rw-r--r-- | res/drawable-mdpi/empty_speed_dial.png | bin | 0 -> 4119 bytes |
| -rw-r--r-- | res/drawable-mdpi/no_favorites_banner.png | bin | 5129 -> 0 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/res/drawable-mdpi/empty_call_log.png b/res/drawable-mdpi/empty_call_log.png Binary files differnew file mode 100644 index 000000000..3cd59b35b --- /dev/null +++ b/res/drawable-mdpi/empty_call_log.png diff --git a/res/drawable-mdpi/empty_contacts.png b/res/drawable-mdpi/empty_contacts.png Binary files differnew file mode 100644 index 000000000..2ce7eae37 --- /dev/null +++ b/res/drawable-mdpi/empty_contacts.png diff --git a/res/drawable-mdpi/empty_speed_dial.png b/res/drawable-mdpi/empty_speed_dial.png Binary files differnew file mode 100644 index 000000000..98152e0d3 --- /dev/null +++ b/res/drawable-mdpi/empty_speed_dial.png diff --git a/res/drawable-mdpi/no_favorites_banner.png b/res/drawable-mdpi/no_favorites_banner.png Binary files differdeleted file mode 100644 index ac080b9e1..000000000 --- a/res/drawable-mdpi/no_favorites_banner.png +++ /dev/null |
