resolved conflicts for merge of 242fa52b to master

Browse Source

Change-Id: I6a6c134fe4fb05dbc15249661b441d88534acb1e

...

This commit is contained in:

Patrick Dubroy

2010-10-04 15:47:03 -07:00

parent 5e25c2c145

commit 3dd101133a

12 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

core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_gray.9.png

Binary file not shown.

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

BIN

core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_green.9.png

Binary file not shown.

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

BIN

core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_red.9.png

Binary file not shown.

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

BIN

core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_yellow.9.png

Binary file not shown.

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

BIN

core/res/res/drawable-hdpi/jog_tab_bar_left_end_normal.9.png

Binary file not shown.

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

BIN

core/res/res/drawable-hdpi/jog_tab_bar_left_end_pressed.9.png

Binary file not shown.

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

BIN

core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_gray.9.png

Binary file not shown.

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

BIN

core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_green.9.png

Binary file not shown.

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

BIN

core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_red.9.png

Binary file not shown.

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

BIN

core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_yellow.9.png

Binary file not shown.

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

BIN

core/res/res/drawable-hdpi/jog_tab_bar_right_end_normal.9.png

Binary file not shown.

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

BIN

core/res/res/drawable-hdpi/jog_tab_bar_right_end_pressed.9.png

Binary file not shown.

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