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 | |
| parent | fffb0b356e0c89c6a51dc0e6d1324aaaea89ca0c (diff) | |
| parent | 6c82fe07cc542a8be43396ea47db0ae88dedffb9 (diff) | |
| download | packages_apps_Settings-2c6d0d1512ed4aab84941a98cbebb867cc5a737d.zip packages_apps_Settings-2c6d0d1512ed4aab84941a98cbebb867cc5a737d.tar.gz packages_apps_Settings-2c6d0d1512ed4aab84941a98cbebb867cc5a737d.tar.bz2 | |
resolved conflicts for merge of 6c82fe07 to master
Change-Id: I90943867003999f890c66b3f72ec1ccf19b2d6a6
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable-hdpi/encroid_progress.png (renamed from res/drawable-xlarge-hdpi/encroid_progress.png) | bin | 60092 -> 60092 bytes |
| -rw-r--r-- | res/drawable-hdpi/encroid_resignin.png (renamed from res/drawable-xlarge-hdpi/encroid_resignin.png) | bin | 12682 -> 12682 bytes |
| -rw-r--r-- | res/drawable-hdpi/encroid_waiting.png (renamed from res/drawable-xlarge-hdpi/encroid_waiting.png) | bin | 97806 -> 97806 bytes |
| -rw-r--r-- | res/drawable-mdpi/encroid_progress.png (renamed from res/drawable-xlarge-mdpi/encroid_progress.png) | bin | 35479 -> 35479 bytes |
| -rw-r--r-- | res/drawable-mdpi/encroid_resignin.png (renamed from res/drawable-xlarge-mdpi/encroid_resignin.png) | bin | 7494 -> 7494 bytes |
| -rw-r--r-- | res/drawable-mdpi/encroid_waiting.png (renamed from res/drawable-xlarge-mdpi/encroid_waiting.png) | bin | 57590 -> 57590 bytes |
6 files changed, 0 insertions, 0 deletions
diff --git a/res/drawable-xlarge-hdpi/encroid_progress.png b/res/drawable-hdpi/encroid_progress.png Binary files differindex 1e8e624..1e8e624 100644 --- a/res/drawable-xlarge-hdpi/encroid_progress.png +++ b/res/drawable-hdpi/encroid_progress.png diff --git a/res/drawable-xlarge-hdpi/encroid_resignin.png b/res/drawable-hdpi/encroid_resignin.png Binary files differindex 326a32a..326a32a 100644 --- a/res/drawable-xlarge-hdpi/encroid_resignin.png +++ b/res/drawable-hdpi/encroid_resignin.png diff --git a/res/drawable-xlarge-hdpi/encroid_waiting.png b/res/drawable-hdpi/encroid_waiting.png Binary files differindex 9111609..9111609 100644 --- a/res/drawable-xlarge-hdpi/encroid_waiting.png +++ b/res/drawable-hdpi/encroid_waiting.png diff --git a/res/drawable-xlarge-mdpi/encroid_progress.png b/res/drawable-mdpi/encroid_progress.png Binary files differindex 0dc40c7..0dc40c7 100644 --- a/res/drawable-xlarge-mdpi/encroid_progress.png +++ b/res/drawable-mdpi/encroid_progress.png diff --git a/res/drawable-xlarge-mdpi/encroid_resignin.png b/res/drawable-mdpi/encroid_resignin.png Binary files differindex edf9fec..edf9fec 100644 --- a/res/drawable-xlarge-mdpi/encroid_resignin.png +++ b/res/drawable-mdpi/encroid_resignin.png diff --git a/res/drawable-xlarge-mdpi/encroid_waiting.png b/res/drawable-mdpi/encroid_waiting.png Binary files differindex 2104c0e..2104c0e 100644 --- a/res/drawable-xlarge-mdpi/encroid_waiting.png +++ b/res/drawable-mdpi/encroid_waiting.png |
