Merge heads

2013-06-08 13:12:39 +08:00
parent 7a09e89041
commit d1055ef5ee
48 changed files with 374 additions and 411 deletions
@@ -93,8 +93,8 @@ limitations under the License.
    <item>-1</item>
  </string-array>
  <string-array name="file_types">
-    <item>GPX</item>
    <item>KML</item>
+    <item>GPX</item>
    <item>CSV</item>
    <item>TCX</item>
  </string-array>