merge heads

Browse Source

...

This commit is contained in:

Jimmy Shih

2012-04-06 10:54:22 -07:00

parent 79fde1c118

commit f5085b208d

319 changed files with 6180 additions and 5754 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

MyTracks/res/drawable-hdpi/ic_menu_lastsegment.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.7 KiB

MyTracks/res/drawable-hdpi/ic_menu_pauserecording.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.7 KiB

MyTracks/res/drawable-hdpi/ic_menu_recordtrack.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.3 KiB

MyTracks/res/drawable-hdpi/ic_menu_stoprecording.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 639 B

MyTracks/res/drawable-hdpi/ic_menu_tracklist.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.1 KiB

MyTracks/res/drawable-hdpi/menu_help.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.5 KiB

MyTracks/res/drawable-hdpi/menu_insert_marker.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.6 KiB

MyTracks/res/drawable-hdpi/menu_play.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.4 KiB

MyTracks/res/drawable-hdpi/menu_record_track.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.1 KiB

MyTracks/res/drawable-hdpi/menu_search.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.7 KiB

MyTracks/res/drawable-hdpi/menu_settings.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.5 KiB

MyTracks/res/drawable-hdpi/menu_share.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.6 KiB

MyTracks/res/drawable-hdpi/menu_stop_recording.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.0 KiB