I think i have done the commit correctly, althought i only had to correct manually keys.xml (add new key from the head branch xml to mine)

MyTracks/src/com/google/android/apps/mytracks/ImportAllTracks.java

@@ -217,4 +217,4 @@ public class ImportAllTracks {
     }
     return gpxFiles;
   }
-}
+}