| commit | 03539f5e8313eea9db616d93a53628a7307bcb0c | [log] [tgz] |
|---|---|---|
| author | Tianjie Xu <xunchang@google.com> | Thu Jul 28 02:50:08 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 28 02:50:08 2016 +0000 |
| tree | 37bc621e020b758a6ec056f7ec0b5057ca146282 | |
| parent | b32823b7e74e5cb7cd5bb4e6d01e60383696ded8 [diff] | |
| parent | 53c34ebdc41e1db7c1e4a1998b7376a0dc9cae9a [diff] |
Resolve merge conflicts of 286848e to stage-aosp-master am: 9da825940d am: 53c34ebdc4 Change-Id: I54f74a04eb36317bc306fd1db20d4d4fb8a9421e
diff --git a/res-hdpi/images/erasing_text.png b/res-hdpi/images/erasing_text.png index e500d02..20daa9f 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 9a3597b..4214e3f 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 76e7474..c214067 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 5d2a5fa..1991b97 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 a567ad1..24155f7 100644 --- a/res-hdpi/images/no_command_text.png +++ b/res-hdpi/images/no_command_text.png Binary files differ
diff --git a/res-mdpi/images/erasing_text.png b/res-mdpi/images/erasing_text.png index ad68a19..a5f2f27 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 8ea5acb..62917fa 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 615b9b7..902d423 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 6cf8716..5dd8686 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 5cc6b37..ae175e3 100644 --- a/res-mdpi/images/no_command_text.png +++ b/res-mdpi/images/no_command_text.png Binary files differ
diff --git a/res-xhdpi/images/erasing_text.png b/res-xhdpi/images/erasing_text.png index 01176e8..2c77606 100644 --- a/res-xhdpi/images/erasing_text.png +++ b/res-xhdpi/images/erasing_text.png Binary files differ
diff --git a/res-xhdpi/images/error_text.png b/res-xhdpi/images/error_text.png index 4f890fa..47fc6ea 100644 --- a/res-xhdpi/images/error_text.png +++ b/res-xhdpi/images/error_text.png Binary files differ
diff --git a/res-xhdpi/images/installing_security_text.png b/res-xhdpi/images/installing_security_text.png index 6192832..ad8151f 100644 --- a/res-xhdpi/images/installing_security_text.png +++ b/res-xhdpi/images/installing_security_text.png Binary files differ
diff --git a/res-xhdpi/images/installing_text.png b/res-xhdpi/images/installing_text.png index 4413529..00e486d 100644 --- a/res-xhdpi/images/installing_text.png +++ b/res-xhdpi/images/installing_text.png Binary files differ
diff --git a/res-xhdpi/images/no_command_text.png b/res-xhdpi/images/no_command_text.png index 9f74037..d113ddc 100644 --- a/res-xhdpi/images/no_command_text.png +++ b/res-xhdpi/images/no_command_text.png Binary files differ
diff --git a/res-xxhdpi/images/erasing_text.png b/res-xxhdpi/images/erasing_text.png index b8653eb..4b56184 100644 --- a/res-xxhdpi/images/erasing_text.png +++ b/res-xxhdpi/images/erasing_text.png Binary files differ
diff --git a/res-xxhdpi/images/error_text.png b/res-xxhdpi/images/error_text.png index d77ee50..cec59c5 100644 --- a/res-xxhdpi/images/error_text.png +++ b/res-xxhdpi/images/error_text.png Binary files differ
diff --git a/res-xxhdpi/images/installing_security_text.png b/res-xxhdpi/images/installing_security_text.png index ca0c191..4b94def 100644 --- a/res-xxhdpi/images/installing_security_text.png +++ b/res-xxhdpi/images/installing_security_text.png Binary files differ
diff --git a/res-xxhdpi/images/installing_text.png b/res-xxhdpi/images/installing_text.png index a76a174..4768400 100644 --- a/res-xxhdpi/images/installing_text.png +++ b/res-xxhdpi/images/installing_text.png Binary files differ
diff --git a/res-xxhdpi/images/no_command_text.png b/res-xxhdpi/images/no_command_text.png index 5e363e3..d013e0a 100644 --- a/res-xxhdpi/images/no_command_text.png +++ b/res-xxhdpi/images/no_command_text.png Binary files differ
diff --git a/res-xxxhdpi/images/erasing_text.png b/res-xxxhdpi/images/erasing_text.png index f4a4661..045eb08 100644 --- a/res-xxxhdpi/images/erasing_text.png +++ b/res-xxxhdpi/images/erasing_text.png Binary files differ
diff --git a/res-xxxhdpi/images/error_text.png b/res-xxxhdpi/images/error_text.png index 317a771..2e72866 100644 --- a/res-xxxhdpi/images/error_text.png +++ b/res-xxxhdpi/images/error_text.png Binary files differ
diff --git a/res-xxxhdpi/images/installing_security_text.png b/res-xxxhdpi/images/installing_security_text.png index c99c907..38d852a 100644 --- a/res-xxxhdpi/images/installing_security_text.png +++ b/res-xxxhdpi/images/installing_security_text.png Binary files differ
diff --git a/res-xxxhdpi/images/installing_text.png b/res-xxxhdpi/images/installing_text.png index 91d8330..1731ede 100644 --- a/res-xxxhdpi/images/installing_text.png +++ b/res-xxxhdpi/images/installing_text.png Binary files differ
diff --git a/res-xxxhdpi/images/no_command_text.png b/res-xxxhdpi/images/no_command_text.png index b6eb964..844abc8 100644 --- a/res-xxxhdpi/images/no_command_text.png +++ b/res-xxxhdpi/images/no_command_text.png Binary files differ
