merge heads

Browse Source

...

This commit is contained in:

Jimmy Shih

2012-06-07 15:45:50 -07:00

parent 2ef56797a5 e2f9e31994

commit 7e2cd35358

42 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

MyTracks/res/drawable-hdpi/blue_pushpin.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-hdpi/green_dot.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-hdpi/menu_play.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-hdpi/menu_record_track.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-hdpi/my_tracks_notification_icon.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-hdpi/red_dot.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-hdpi/tab_chart.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-hdpi/tab_map.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-hdpi/tab_stats.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-hdpi/track.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-hdpi/yellow_pushpin.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-ldpi/blue_pushpin.png

Executable

BIN

Binary file not shown.

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

MyTracks/res/drawable-ldpi/tab_chart.png

Executable

BIN

Binary file not shown.

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

MyTracks/res/drawable-ldpi/tab_map.png

Executable

BIN

Binary file not shown.

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

MyTracks/res/drawable-xhdpi/tab_chart.png → MyTracks/res/drawable-ldpi/tab_stats.png

Regular → Executable

BIN

Binary file not shown.

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

MyTracks/res/drawable-xhdpi/tab_stats.png → MyTracks/res/drawable-ldpi/warning.png

Regular → Executable

BIN

Binary file not shown.

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

MyTracks/res/drawable-ldpi/yellow_pushpin.png

Executable

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/blue_pushpin.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/green_dot.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/menu_play.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/menu_record_track.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/my_tracks_notification_icon.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/red_dot.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/tab_chart.png

Regular → Executable

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/tab_map.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/tab_stats.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/track.png

Regular → Executable

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/warning.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/yellow_pushpin.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-xhdpi/blue_pushpin.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-xhdpi/green_dot.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-xhdpi/menu_play.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-xhdpi/menu_record_track.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-xhdpi/my_tracks_notification_icon.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-xhdpi/red_dot.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-xhdpi/tab_map.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-xhdpi/track.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-xhdpi/warning.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-xhdpi/yellow_pushpin.png

BIN

Binary file not shown.

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

MyTracksLib/res/drawable-hdpi/my_tracks_icon.png

BIN

Binary file not shown.

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

MyTracksLib/res/drawable-mdpi/my_tracks_icon.png

BIN

Binary file not shown.

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

MyTracksLib/res/drawable-xhdpi/my_tracks_icon.png

BIN

Binary file not shown.

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