Merging from head.

MyTracksTest/default.properties

@@ -10,4 +10,4 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=Google Inc.:Google APIs:8
+target=Google Inc.:Google APIs:9

MyTracksTest/src/com/google/android/apps/mytracks/io/backup/PreferenceBackupHelperTest.java

@@ -38,7 +38,7 @@ public class PreferenceBackupHelperTest extends TestCase {
    */
   private class MockPreferenceEditor implements SharedPreferences.Editor {
     private Map<String, Object> newPreferences = new HashMap<String, Object>(preferenceValues);
-    
+
     @Override
     public Editor clear() {
       newPreferences.clear();
@@ -51,6 +51,11 @@ public class PreferenceBackupHelperTest extends TestCase {
       return true;
     }
 
+    @Override
+    public void apply() {
+      commit();
+    }
+
     @Override
     public Editor putBoolean(String key, boolean value) {
       return put(key, value);

MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java

@@ -502,7 +502,7 @@ public class TrackRecordingServiceTest
   public void testDeleteAllTracks_trackInProgress() throws Exception {
     createDummyTrack(123, -1, true);
     assertEquals(1, providerUtils.getAllTracks().size());
-    
+
     ITrackRecordingService service = bindAndGetService(createStartIntent());
     assertTrue(service.isRecording());