resolved conflicts for merge of ac96a560 to honeycomb-merge

Browse Source

Change-Id: Ibc0b1fa69597672293f6b753f18f8a14ee732d0b

...

This commit is contained in:

Jeff Hamilton

2011-01-26 11:12:41 -06:00

parent 24dee78082 ac96a5607d

commit a9bb7f1472

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