resolved conflicts for merge of 2b9fd2d7 to master

Browse Source

...

This commit is contained in:

Daniel Sandler

2009-08-31 16:41:57 -04:00

parent 9d81a6fca2 2b9fd2d739

commit 3cdbc2dfc1

24 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

res/drawable-hdpi/lock_anim_0.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 22 KiB

BIN

res/drawable-hdpi/lock_anim_1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 22 KiB

BIN

res/drawable-hdpi/lock_anim_11.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 26 KiB

BIN

res/drawable-hdpi/lock_anim_13.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 27 KiB

BIN

res/drawable-hdpi/lock_anim_2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 23 KiB

BIN

res/drawable-hdpi/lock_anim_3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 23 KiB

BIN

res/drawable-hdpi/lock_anim_4.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 24 KiB

BIN

res/drawable-hdpi/lock_anim_5.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 25 KiB

BIN

res/drawable-hdpi/lock_anim_6.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 25 KiB

BIN

res/drawable-hdpi/lock_anim_7.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 24 KiB

BIN

res/drawable-hdpi/lock_anim_8.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 24 KiB

BIN

res/drawable-hdpi/lock_anim_9.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 26 KiB

0

res/drawable/lock_anim_0.png → res/drawable-mdpi/lock_anim_0.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 13 KiB After Width:  |  Height:  |  Size: 13 KiB

0

res/drawable/lock_anim_1.png → res/drawable-mdpi/lock_anim_1.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 14 KiB After Width:  |  Height:  |  Size: 14 KiB

0

res/drawable/lock_anim_11.png → res/drawable-mdpi/lock_anim_11.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 17 KiB After Width:  |  Height:  |  Size: 17 KiB

0

res/drawable/lock_anim_13.png → res/drawable-mdpi/lock_anim_13.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 17 KiB After Width:  |  Height:  |  Size: 17 KiB

0

res/drawable/lock_anim_2.png → res/drawable-mdpi/lock_anim_2.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 14 KiB After Width:  |  Height:  |  Size: 14 KiB

0

res/drawable/lock_anim_3.png → res/drawable-mdpi/lock_anim_3.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 14 KiB After Width:  |  Height:  |  Size: 14 KiB

0

res/drawable/lock_anim_4.png → res/drawable-mdpi/lock_anim_4.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 15 KiB After Width:  |  Height:  |  Size: 15 KiB

0

res/drawable/lock_anim_5.png → res/drawable-mdpi/lock_anim_5.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 16 KiB After Width:  |  Height:  |  Size: 16 KiB

0

res/drawable/lock_anim_6.png → res/drawable-mdpi/lock_anim_6.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 16 KiB After Width:  |  Height:  |  Size: 16 KiB

0

res/drawable/lock_anim_7.png → res/drawable-mdpi/lock_anim_7.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 15 KiB After Width:  |  Height:  |  Size: 15 KiB

0

res/drawable/lock_anim_8.png → res/drawable-mdpi/lock_anim_8.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 15 KiB After Width:  |  Height:  |  Size: 15 KiB

0

res/drawable/lock_anim_9.png → res/drawable-mdpi/lock_anim_9.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 16 KiB After Width:  |  Height:  |  Size: 16 KiB