diff options
| author | Daniel Sandler <dsandler@google.com> | 2009-08-31 16:41:57 -0400 |
|---|---|---|
| committer | Daniel Sandler <dsandler@google.com> | 2009-08-31 16:41:57 -0400 |
| commit | 3cdbc2dfc1b4bc817cb1f2db724e308629955a7c (patch) | |
| tree | 2b45758c21ce4565ad04222b78e264e18a0fd5a4 /res/drawable-hdpi | |
| parent | 9d81a6fca29b49ce36bdb956d01dbf20f7cf42e1 (diff) | |
| parent | 2b9fd2d739085a297ec81ae73eebd60fed4c6896 (diff) | |
| download | packages_apps_Settings-3cdbc2dfc1b4bc817cb1f2db724e308629955a7c.zip packages_apps_Settings-3cdbc2dfc1b4bc817cb1f2db724e308629955a7c.tar.gz packages_apps_Settings-3cdbc2dfc1b4bc817cb1f2db724e308629955a7c.tar.bz2 | |
resolved conflicts for merge of 2b9fd2d7 to master
Diffstat (limited to 'res/drawable-hdpi')
| -rw-r--r-- | res/drawable-hdpi/lock_anim_0.png | bin | 0 -> 22548 bytes |
| -rw-r--r-- | res/drawable-hdpi/lock_anim_1.png | bin | 0 -> 22499 bytes |
| -rw-r--r-- | res/drawable-hdpi/lock_anim_11.png | bin | 0 -> 26697 bytes |
| -rw-r--r-- | res/drawable-hdpi/lock_anim_13.png | bin | 0 -> 27473 bytes |
| -rw-r--r-- | res/drawable-hdpi/lock_anim_2.png | bin | 0 -> 23545 bytes |
| -rw-r--r-- | res/drawable-hdpi/lock_anim_3.png | bin | 0 -> 23937 bytes |
| -rw-r--r-- | res/drawable-hdpi/lock_anim_4.png | bin | 0 -> 24973 bytes |
| -rw-r--r-- | res/drawable-hdpi/lock_anim_5.png | bin | 0 -> 25899 bytes |
| -rw-r--r-- | res/drawable-hdpi/lock_anim_6.png | bin | 0 -> 25839 bytes |
| -rw-r--r-- | res/drawable-hdpi/lock_anim_7.png | bin | 0 -> 24946 bytes |
| -rw-r--r-- | res/drawable-hdpi/lock_anim_8.png | bin | 0 -> 24684 bytes |
| -rw-r--r-- | res/drawable-hdpi/lock_anim_9.png | bin | 0 -> 26646 bytes |
12 files changed, 0 insertions, 0 deletions
diff --git a/res/drawable-hdpi/lock_anim_0.png b/res/drawable-hdpi/lock_anim_0.png Binary files differnew file mode 100644 index 0000000..08732e4 --- /dev/null +++ b/res/drawable-hdpi/lock_anim_0.png diff --git a/res/drawable-hdpi/lock_anim_1.png b/res/drawable-hdpi/lock_anim_1.png Binary files differnew file mode 100644 index 0000000..74a0628 --- /dev/null +++ b/res/drawable-hdpi/lock_anim_1.png diff --git a/res/drawable-hdpi/lock_anim_11.png b/res/drawable-hdpi/lock_anim_11.png Binary files differnew file mode 100644 index 0000000..f8976a2 --- /dev/null +++ b/res/drawable-hdpi/lock_anim_11.png diff --git a/res/drawable-hdpi/lock_anim_13.png b/res/drawable-hdpi/lock_anim_13.png Binary files differnew file mode 100644 index 0000000..ccd38d5 --- /dev/null +++ b/res/drawable-hdpi/lock_anim_13.png diff --git a/res/drawable-hdpi/lock_anim_2.png b/res/drawable-hdpi/lock_anim_2.png Binary files differnew file mode 100644 index 0000000..495b2da --- /dev/null +++ b/res/drawable-hdpi/lock_anim_2.png diff --git a/res/drawable-hdpi/lock_anim_3.png b/res/drawable-hdpi/lock_anim_3.png Binary files differnew file mode 100644 index 0000000..fa37813 --- /dev/null +++ b/res/drawable-hdpi/lock_anim_3.png diff --git a/res/drawable-hdpi/lock_anim_4.png b/res/drawable-hdpi/lock_anim_4.png Binary files differnew file mode 100644 index 0000000..8201fd9 --- /dev/null +++ b/res/drawable-hdpi/lock_anim_4.png diff --git a/res/drawable-hdpi/lock_anim_5.png b/res/drawable-hdpi/lock_anim_5.png Binary files differnew file mode 100644 index 0000000..b08932d --- /dev/null +++ b/res/drawable-hdpi/lock_anim_5.png diff --git a/res/drawable-hdpi/lock_anim_6.png b/res/drawable-hdpi/lock_anim_6.png Binary files differnew file mode 100644 index 0000000..dac09e1 --- /dev/null +++ b/res/drawable-hdpi/lock_anim_6.png diff --git a/res/drawable-hdpi/lock_anim_7.png b/res/drawable-hdpi/lock_anim_7.png Binary files differnew file mode 100644 index 0000000..f06c9d6 --- /dev/null +++ b/res/drawable-hdpi/lock_anim_7.png diff --git a/res/drawable-hdpi/lock_anim_8.png b/res/drawable-hdpi/lock_anim_8.png Binary files differnew file mode 100644 index 0000000..07f7e34 --- /dev/null +++ b/res/drawable-hdpi/lock_anim_8.png diff --git a/res/drawable-hdpi/lock_anim_9.png b/res/drawable-hdpi/lock_anim_9.png Binary files differnew file mode 100644 index 0000000..551bafa --- /dev/null +++ b/res/drawable-hdpi/lock_anim_9.png |
