aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu2016-07-27 21:37:24 -0500
committerTianjie Xu2016-07-27 21:39:43 -0500
commit9da825940d4a764b1ac5fe77d40367a4f052c57b (patch)
tree8ffb2534b471763b48726da12f04e2025372be8c /res-mdpi
parent977903da4907a1b17f6f90b5154cdcba962ab619 (diff)
parent286848e7543107609d14cdf7eaf4f49828009393 (diff)
downloadplatform-bootable-recovery-9da825940d4a764b1ac5fe77d40367a4f052c57b.tar.gz
platform-bootable-recovery-9da825940d4a764b1ac5fe77d40367a4f052c57b.tar.xz
platform-bootable-recovery-9da825940d4a764b1ac5fe77d40367a4f052c57b.zip
Resolve merge conflicts of 286848e to stage-aosp-master
Change-Id: I3bfe781a215e09ebe162af8522972976c110410f
Diffstat (limited to 'res-mdpi')
-rw-r--r--res-mdpi/images/erasing_text.pngbin31323 -> 32189 bytes
-rw-r--r--res-mdpi/images/error_text.pngbin22467 -> 23142 bytes
-rw-r--r--res-mdpi/images/installing_security_text.pngbin74376 -> 75404 bytes
-rw-r--r--res-mdpi/images/installing_text.pngbin66242 -> 67186 bytes
-rw-r--r--res-mdpi/images/no_command_text.pngbin36416 -> 37175 bytes
5 files changed, 0 insertions, 0 deletions
diff --git a/res-mdpi/images/erasing_text.png b/res-mdpi/images/erasing_text.png
index ad68a194..a5f2f270 100644
--- a/res-mdpi/images/erasing_text.png
+++ b/res-mdpi/images/erasing_text.png
Binary files differ
diff --git a/res-mdpi/images/error_text.png b/res-mdpi/images/error_text.png
index 8ea5acb2..62917fa1 100644
--- a/res-mdpi/images/error_text.png
+++ b/res-mdpi/images/error_text.png
Binary files differ
diff --git a/res-mdpi/images/installing_security_text.png b/res-mdpi/images/installing_security_text.png
index 615b9b73..902d4237 100644
--- a/res-mdpi/images/installing_security_text.png
+++ b/res-mdpi/images/installing_security_text.png
Binary files differ
diff --git a/res-mdpi/images/installing_text.png b/res-mdpi/images/installing_text.png
index 6cf8716b..5dd8686c 100644
--- a/res-mdpi/images/installing_text.png
+++ b/res-mdpi/images/installing_text.png
Binary files differ
diff --git a/res-mdpi/images/no_command_text.png b/res-mdpi/images/no_command_text.png
index 5cc6b371..ae175e3b 100644
--- a/res-mdpi/images/no_command_text.png
+++ b/res-mdpi/images/no_command_text.png
Binary files differ