diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-06-03 14:34:30 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2011-06-03 14:34:30 -0700 |
| commit | 2c6d0d1512ed4aab84941a98cbebb867cc5a737d (patch) | |
| tree | d7095abd61d38c863d8f3716d9b0a7ed60fc1abc /res/drawable-mdpi | |
| parent | fffb0b356e0c89c6a51dc0e6d1324aaaea89ca0c (diff) | |
| parent | 6c82fe07cc542a8be43396ea47db0ae88dedffb9 (diff) | |
| download | packages_apps_Settings-2c6d0d1512ed4aab84941a98cbebb867cc5a737d.tar.gz packages_apps_Settings-2c6d0d1512ed4aab84941a98cbebb867cc5a737d.tar.bz2 packages_apps_Settings-2c6d0d1512ed4aab84941a98cbebb867cc5a737d.zip | |
resolved conflicts for merge of 6c82fe07 to master
Change-Id: I90943867003999f890c66b3f72ec1ccf19b2d6a6
Diffstat (limited to 'res/drawable-mdpi')
| -rw-r--r-- | res/drawable-mdpi/encroid_progress.png | bin | 0 -> 35479 bytes |
| -rw-r--r-- | res/drawable-mdpi/encroid_resignin.png | bin | 0 -> 7494 bytes |
| -rw-r--r-- | res/drawable-mdpi/encroid_waiting.png | bin | 0 -> 57590 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/res/drawable-mdpi/encroid_progress.png b/res/drawable-mdpi/encroid_progress.png Binary files differnew file mode 100644 index 000000000..0dc40c7e2 --- /dev/null +++ b/res/drawable-mdpi/encroid_progress.png diff --git a/res/drawable-mdpi/encroid_resignin.png b/res/drawable-mdpi/encroid_resignin.png Binary files differnew file mode 100644 index 000000000..edf9fecd9 --- /dev/null +++ b/res/drawable-mdpi/encroid_resignin.png diff --git a/res/drawable-mdpi/encroid_waiting.png b/res/drawable-mdpi/encroid_waiting.png Binary files differnew file mode 100644 index 000000000..2104c0e55 --- /dev/null +++ b/res/drawable-mdpi/encroid_waiting.png |
