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-hdpi
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-hdpi')
-rw-r--r--res-hdpi/images/erasing_text.pngbin55181 -> 55865 bytes
-rw-r--r--res-hdpi/images/error_text.pngbin39052 -> 39496 bytes
-rw-r--r--res-hdpi/images/installing_security_text.pngbin122186 -> 121731 bytes
-rw-r--r--res-hdpi/images/installing_text.pngbin113078 -> 112002 bytes
-rw-r--r--res-hdpi/images/no_command_text.pngbin67427 -> 68099 bytes
5 files changed, 0 insertions, 0 deletions
diff --git a/res-hdpi/images/erasing_text.png b/res-hdpi/images/erasing_text.png
index e500d026..20daa9f0 100644
--- a/res-hdpi/images/erasing_text.png
+++ b/res-hdpi/images/erasing_text.png
Binary files differ
diff --git a/res-hdpi/images/error_text.png b/res-hdpi/images/error_text.png
index 9a3597b8..4214e3f1 100644
--- a/res-hdpi/images/error_text.png
+++ b/res-hdpi/images/error_text.png
Binary files differ
diff --git a/res-hdpi/images/installing_security_text.png b/res-hdpi/images/installing_security_text.png
index 76e74741..c214067b 100644
--- a/res-hdpi/images/installing_security_text.png
+++ b/res-hdpi/images/installing_security_text.png
Binary files differ
diff --git a/res-hdpi/images/installing_text.png b/res-hdpi/images/installing_text.png
index 5d2a5fa0..1991b970 100644
--- a/res-hdpi/images/installing_text.png
+++ b/res-hdpi/images/installing_text.png
Binary files differ
diff --git a/res-hdpi/images/no_command_text.png b/res-hdpi/images/no_command_text.png
index a567ad14..24155f71 100644
--- a/res-hdpi/images/no_command_text.png
+++ b/res-hdpi/images/no_command_text.png
Binary files differ