Merge heads

This commit is contained in:
Jimmy Shih
2011-10-21 09:49:38 -07:00
23 changed files with 288 additions and 145 deletions
+1
View File
@@ -194,6 +194,7 @@ limitations under the License.
<string name="tracklist_share_csv_file">A CSV file</string>
<string name="tracklist_share_tcx_file">A TCX file</string>
<string name="tracklist_clear_map">Clear map</string>
<!-- Import All -->
<string name="tracklist_btn_import_all">Import all</string>
<!-- Format: