resolved conflicts for merge of c8e12573 to honeycomb-plus-aosp

Browse Source

Change-Id: I2ee1cb90df9617e470aec99671a05d99939f30f2

...

This commit is contained in:

Scott Main

2011-01-12 16:31:29 -08:00

parent ed5b697480 c8e1257329

commit ad60decc9d

10 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

samples/NotePad/res/drawable-hdpi/ic_menu_compose.png

Binary file not shown.

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

BIN

samples/NotePad/res/drawable-hdpi/ic_menu_delete.png

Binary file not shown.

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

BIN

samples/NotePad/res/drawable-hdpi/ic_menu_edit.png

Binary file not shown.

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

BIN

samples/NotePad/res/drawable-hdpi/ic_menu_revert.png

Binary file not shown.

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

BIN

samples/NotePad/res/drawable-hdpi/ic_menu_save.png

Binary file not shown.

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

BIN

samples/NotePad/res/drawable/ic_menu_compose.png

Binary file not shown.

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

BIN

samples/NotePad/res/drawable/ic_menu_delete.png Executable file → Normal file

Binary file not shown.

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

BIN

samples/NotePad/res/drawable/ic_menu_edit.png Executable file → Normal file

Binary file not shown.

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

BIN

samples/NotePad/res/drawable/ic_menu_revert.png

Binary file not shown.

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

BIN

samples/NotePad/res/drawable/ic_menu_save.png

Binary file not shown.

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