resolved conflicts for merge of 2b9fd2d7 to master

2009-08-31 16:41:57 -04:00
parent 9d81a6fca2 2b9fd2d739
commit 3cdbc2dfc1
24 changed files with 0 additions and 0 deletions
--- a/res/drawable/lock_anim_0.png
+++ b/res/drawable/lock_anim_0.png
--- a/res/drawable/lock_anim_1.png
+++ b/res/drawable/lock_anim_1.png
--- a/res/drawable/lock_anim_11.png
+++ b/res/drawable/lock_anim_11.png
--- a/res/drawable/lock_anim_13.png
+++ b/res/drawable/lock_anim_13.png
--- a/res/drawable/lock_anim_2.png
+++ b/res/drawable/lock_anim_2.png
--- a/res/drawable/lock_anim_3.png
+++ b/res/drawable/lock_anim_3.png
--- a/res/drawable/lock_anim_4.png
+++ b/res/drawable/lock_anim_4.png
--- a/res/drawable/lock_anim_5.png
+++ b/res/drawable/lock_anim_5.png
--- a/res/drawable/lock_anim_6.png
+++ b/res/drawable/lock_anim_6.png
--- a/res/drawable/lock_anim_7.png
+++ b/res/drawable/lock_anim_7.png
--- a/res/drawable/lock_anim_8.png
+++ b/res/drawable/lock_anim_8.png
--- a/res/drawable/lock_anim_9.png
+++ b/res/drawable/lock_anim_9.png