Resolve merge conflicts of 286848e to stage-aosp-master

Browse Source

Change-Id: I3bfe781a215e09ebe162af8522972976c110410f

...

This commit is contained in:

Tianjie Xu

2016-07-27 19:37:24 -07:00

parent 977903da49 286848e754

commit 9da825940d

25 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

res-hdpi/images/erasing_text.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 54 KiB After Width:  |  Height:  |  Size: 55 KiB

BIN

res-hdpi/images/error_text.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 38 KiB After Width:  |  Height:  |  Size: 39 KiB

BIN

res-hdpi/images/installing_security_text.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 119 KiB After Width:  |  Height:  |  Size: 119 KiB

BIN

res-hdpi/images/installing_text.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 110 KiB After Width:  |  Height:  |  Size: 109 KiB

BIN

res-hdpi/images/no_command_text.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 66 KiB After Width:  |  Height:  |  Size: 66 KiB

BIN

res-mdpi/images/erasing_text.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 31 KiB After Width:  |  Height:  |  Size: 31 KiB

BIN

res-mdpi/images/error_text.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 22 KiB After Width:  |  Height:  |  Size: 23 KiB

BIN

res-mdpi/images/installing_security_text.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 73 KiB After Width:  |  Height:  |  Size: 74 KiB

BIN

res-mdpi/images/installing_text.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 65 KiB After Width:  |  Height:  |  Size: 66 KiB

BIN

res-mdpi/images/no_command_text.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 36 KiB After Width:  |  Height:  |  Size: 36 KiB

BIN

res-xhdpi/images/erasing_text.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 78 KiB After Width:  |  Height:  |  Size: 79 KiB

BIN

res-xhdpi/images/error_text.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 57 KiB After Width:  |  Height:  |  Size: 58 KiB

BIN

res-xhdpi/images/installing_security_text.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 207 KiB After Width:  |  Height:  |  Size: 208 KiB

BIN

res-xhdpi/images/installing_text.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 187 KiB After Width:  |  Height:  |  Size: 187 KiB

BIN

res-xhdpi/images/no_command_text.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 93 KiB After Width:  |  Height:  |  Size: 93 KiB

BIN

res-xxhdpi/images/erasing_text.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 133 KiB After Width:  |  Height:  |  Size: 131 KiB

BIN

res-xxhdpi/images/error_text.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 94 KiB After Width:  |  Height:  |  Size: 95 KiB

BIN

res-xxhdpi/images/installing_security_text.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 474 KiB After Width:  |  Height:  |  Size: 477 KiB

BIN

res-xxhdpi/images/installing_text.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 445 KiB After Width:  |  Height:  |  Size: 440 KiB

BIN

res-xxhdpi/images/no_command_text.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 260 KiB After Width:  |  Height:  |  Size: 261 KiB

BIN

res-xxxhdpi/images/erasing_text.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 290 KiB After Width:  |  Height:  |  Size: 294 KiB

BIN

res-xxxhdpi/images/error_text.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 195 KiB After Width:  |  Height:  |  Size: 203 KiB

BIN

res-xxxhdpi/images/installing_security_text.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 660 KiB After Width:  |  Height:  |  Size: 652 KiB

BIN

res-xxxhdpi/images/installing_text.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 622 KiB After Width:  |  Height:  |  Size: 628 KiB

BIN

res-xxxhdpi/images/no_command_text.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 364 KiB After Width:  |  Height:  |  Size: 372 KiB