merge heads

Browse Source

...

This commit is contained in:

Jimmy Shih

2012-04-04 16:49:55 -07:00

parent aab0f63201

commit 1c0ce45937

13 changed files with 70 additions and 75 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/menu/main.xml → MyTracks/res/menu/track_detail.xml