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 | |
| 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')
| -rw-r--r-- | res/drawable/lock_anim_0.png | bin | 13458 -> 0 bytes |
| -rw-r--r-- | res/drawable/lock_anim_1.png | bin | 13853 -> 0 bytes |
| -rw-r--r-- | res/drawable/lock_anim_11.png | bin | 16975 -> 0 bytes |
| -rw-r--r-- | res/drawable/lock_anim_13.png | bin | 17414 -> 0 bytes |
| -rw-r--r-- | res/drawable/lock_anim_2.png | bin | 14191 -> 0 bytes |
| -rw-r--r-- | res/drawable/lock_anim_3.png | bin | 14394 -> 0 bytes |
| -rw-r--r-- | res/drawable/lock_anim_4.png | bin | 15410 -> 0 bytes |
| -rw-r--r-- | res/drawable/lock_anim_5.png | bin | 15863 -> 0 bytes |
| -rw-r--r-- | res/drawable/lock_anim_6.png | bin | 15985 -> 0 bytes |
| -rw-r--r-- | res/drawable/lock_anim_7.png | bin | 15510 -> 0 bytes |
| -rw-r--r-- | res/drawable/lock_anim_8.png | bin | 15411 -> 0 bytes |
| -rw-r--r-- | res/drawable/lock_anim_9.png | bin | 16656 -> 0 bytes |
12 files changed, 0 insertions, 0 deletions
diff --git a/res/drawable/lock_anim_0.png b/res/drawable/lock_anim_0.png Binary files differdeleted file mode 100644 index afdda8b..0000000 --- a/res/drawable/lock_anim_0.png +++ /dev/null diff --git a/res/drawable/lock_anim_1.png b/res/drawable/lock_anim_1.png Binary files differdeleted file mode 100644 index 6cae8e5..0000000 --- a/res/drawable/lock_anim_1.png +++ /dev/null diff --git a/res/drawable/lock_anim_11.png b/res/drawable/lock_anim_11.png Binary files differdeleted file mode 100644 index 35db815..0000000 --- a/res/drawable/lock_anim_11.png +++ /dev/null diff --git a/res/drawable/lock_anim_13.png b/res/drawable/lock_anim_13.png Binary files differdeleted file mode 100644 index d0b8cf0..0000000 --- a/res/drawable/lock_anim_13.png +++ /dev/null diff --git a/res/drawable/lock_anim_2.png b/res/drawable/lock_anim_2.png Binary files differdeleted file mode 100644 index 0542b1d..0000000 --- a/res/drawable/lock_anim_2.png +++ /dev/null diff --git a/res/drawable/lock_anim_3.png b/res/drawable/lock_anim_3.png Binary files differdeleted file mode 100644 index 7e2ba9a..0000000 --- a/res/drawable/lock_anim_3.png +++ /dev/null diff --git a/res/drawable/lock_anim_4.png b/res/drawable/lock_anim_4.png Binary files differdeleted file mode 100644 index a3ca629..0000000 --- a/res/drawable/lock_anim_4.png +++ /dev/null diff --git a/res/drawable/lock_anim_5.png b/res/drawable/lock_anim_5.png Binary files differdeleted file mode 100644 index 17e3839..0000000 --- a/res/drawable/lock_anim_5.png +++ /dev/null diff --git a/res/drawable/lock_anim_6.png b/res/drawable/lock_anim_6.png Binary files differdeleted file mode 100644 index 90205a6..0000000 --- a/res/drawable/lock_anim_6.png +++ /dev/null diff --git a/res/drawable/lock_anim_7.png b/res/drawable/lock_anim_7.png Binary files differdeleted file mode 100644 index 1d94a47..0000000 --- a/res/drawable/lock_anim_7.png +++ /dev/null diff --git a/res/drawable/lock_anim_8.png b/res/drawable/lock_anim_8.png Binary files differdeleted file mode 100644 index af7cd28..0000000 --- a/res/drawable/lock_anim_8.png +++ /dev/null diff --git a/res/drawable/lock_anim_9.png b/res/drawable/lock_anim_9.png Binary files differdeleted file mode 100644 index d401624..0000000 --- a/res/drawable/lock_anim_9.png +++ /dev/null |
