merge heads

Browse Source

...

This commit is contained in:

Jimmy Shih

2012-04-07 10:13:16 -07:00

parent 0ed45e40c6

commit 54bfe5d4b4

38 changed files with 2028 additions and 2665 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/values/strings.xml

+254 -621

File diff suppressed because it is too large Load Diff