resolved conflicts for merge of 2b9fd2d7 to master

24 files changed, 0 insertions, 0 deletions

diff --git a/res/drawable-hdpi/lock_anim_0.png b/res/drawable-hdpi/lock_anim_0.png
new 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
new 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
new 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
new 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
new 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
new 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
new 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
new 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
new 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
new 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
new 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
new file mode 100644
index 0000000..551bafa
--- /dev/null
+++ b/res/drawable-hdpi/lock_anim_9.png
diff --git a/res/drawable/lock_anim_0.png b/res/drawable-mdpi/lock_anim_0.png
index afdda8b..afdda8b 100644
--- a/res/drawable/lock_anim_0.png
+++ b/res/drawable-mdpi/lock_anim_0.png
diff --git a/res/drawable/lock_anim_1.png b/res/drawable-mdpi/lock_anim_1.png
index 6cae8e5..6cae8e5 100644
--- a/res/drawable/lock_anim_1.png
+++ b/res/drawable-mdpi/lock_anim_1.png
diff --git a/res/drawable/lock_anim_11.png b/res/drawable-mdpi/lock_anim_11.png
index 35db815..35db815 100644
--- a/res/drawable/lock_anim_11.png
+++ b/res/drawable-mdpi/lock_anim_11.png
diff --git a/res/drawable/lock_anim_13.png b/res/drawable-mdpi/lock_anim_13.png
index d0b8cf0..d0b8cf0 100644
--- a/res/drawable/lock_anim_13.png
+++ b/res/drawable-mdpi/lock_anim_13.png
diff --git a/res/drawable/lock_anim_2.png b/res/drawable-mdpi/lock_anim_2.png
index 0542b1d..0542b1d 100644
--- a/res/drawable/lock_anim_2.png
+++ b/res/drawable-mdpi/lock_anim_2.png
diff --git a/res/drawable/lock_anim_3.png b/res/drawable-mdpi/lock_anim_3.png
index 7e2ba9a..7e2ba9a 100644
--- a/res/drawable/lock_anim_3.png
+++ b/res/drawable-mdpi/lock_anim_3.png
diff --git a/res/drawable/lock_anim_4.png b/res/drawable-mdpi/lock_anim_4.png
index a3ca629..a3ca629 100644
--- a/res/drawable/lock_anim_4.png
+++ b/res/drawable-mdpi/lock_anim_4.png
diff --git a/res/drawable/lock_anim_5.png b/res/drawable-mdpi/lock_anim_5.png
index 17e3839..17e3839 100644
--- a/res/drawable/lock_anim_5.png
+++ b/res/drawable-mdpi/lock_anim_5.png
diff --git a/res/drawable/lock_anim_6.png b/res/drawable-mdpi/lock_anim_6.png
index 90205a6..90205a6 100644
--- a/res/drawable/lock_anim_6.png
+++ b/res/drawable-mdpi/lock_anim_6.png
diff --git a/res/drawable/lock_anim_7.png b/res/drawable-mdpi/lock_anim_7.png
index 1d94a47..1d94a47 100644
--- a/res/drawable/lock_anim_7.png
+++ b/res/drawable-mdpi/lock_anim_7.png
diff --git a/res/drawable/lock_anim_8.png b/res/drawable-mdpi/lock_anim_8.png
index af7cd28..af7cd28 100644
--- a/res/drawable/lock_anim_8.png
+++ b/res/drawable-mdpi/lock_anim_8.png
diff --git a/res/drawable/lock_anim_9.png b/res/drawable-mdpi/lock_anim_9.png
index d401624..d401624 100644
--- a/res/drawable/lock_anim_9.png
+++ b/res/drawable-mdpi/lock_anim_9.png