diff options
| author | Gilles Debunne <debunne@google.com> | 2010-10-05 12:11:56 -0700 |
|---|---|---|
| committer | Gilles Debunne <debunne@google.com> | 2010-10-05 12:11:56 -0700 |
| commit | ff3c191d2a8a71f2b63386a8623a584b06416ab2 (patch) | |
| tree | e7313cbaa9859fb9d302969a21f0837fb1676529 /packages | |
| parent | ef52176f1244a5bb98d82a0c8c7f4351edec17a1 (diff) | |
| parent | 8390651c124546a2600c5f830afbcc7d2edd4d8f (diff) | |
| download | frameworks_base-ff3c191d2a8a71f2b63386a8623a584b06416ab2.zip frameworks_base-ff3c191d2a8a71f2b63386a8623a584b06416ab2.tar.gz frameworks_base-ff3c191d2a8a71f2b63386a8623a584b06416ab2.tar.bz2 | |
resolved conflicts for merge of 8390651c to master
Change-Id: Ibaa6034dbf87473dfb7d8a324a5f91fc745b99aa
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/res/drawable-hdpi/battery_low_battery.png | bin | 4759 -> 4060 bytes |
| -rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_signal_0.png | bin | 1058 -> 1188 bytes |
| -rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_signal_0_fully.png | bin | 313 -> 1188 bytes |
| -rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1.png | bin | 1070 -> 1545 bytes |
| -rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1_fully.png | bin | 1070 -> 1558 bytes |
| -rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2.png | bin | 1070 -> 1746 bytes |
| -rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2_fully.png | bin | 1070 -> 1755 bytes |
| -rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3.png | bin | 1042 -> 1832 bytes |
| -rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3_fully.png | bin | 1042 -> 1833 bytes |
| -rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4.png | bin | 986 -> 1890 bytes |
| -rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4_fully.png | bin | 986 -> 1890 bytes |
11 files changed, 0 insertions, 0 deletions
diff --git a/packages/SystemUI/res/drawable-hdpi/battery_low_battery.png b/packages/SystemUI/res/drawable-hdpi/battery_low_battery.png Binary files differindex d894f7b..e74c22f 100644 --- a/packages/SystemUI/res/drawable-hdpi/battery_low_battery.png +++ b/packages/SystemUI/res/drawable-hdpi/battery_low_battery.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_0.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_0.png Binary files differindex 3e317dd..b16e436 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_0.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_0.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_0_fully.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_0_fully.png Binary files differindex 2f66b1d..b16e436 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_0_fully.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_0_fully.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1.png Binary files differindex 72329f8..1b6ed74 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1_fully.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1_fully.png Binary files differindex 72329f8..43e35d3 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1_fully.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1_fully.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2.png Binary files differindex 558c49c..498adbb 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2_fully.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2_fully.png Binary files differindex 558c49c..b7e42a0 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2_fully.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2_fully.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3.png Binary files differindex 6440bdd..959fc5c 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3_fully.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3_fully.png Binary files differindex 6440bdd..f905979 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3_fully.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3_fully.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4.png Binary files differindex fe20423..6e8e73c 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4_fully.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4_fully.png Binary files differindex fe20423..b5799c8 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4_fully.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4_fully.png |
