Merge with head.

MyTracksLib/src/com/google/android/apps/mytracks/services/ITrackRecordingService.aidl

@@ -1,12 +1,12 @@
 /*
  * Copyright 2008 Google Inc.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -66,17 +66,6 @@ interface ITrackRecordingService {
    */
   void endCurrentTrack();
 
-  /**
-   * Returns whether at least one track has been or is being recorded (and was
-   * not deleted).
-   */
-  boolean hasRecorded();
-
-  /**
-   * Deletes all the stored tracks.
-   */
-  void deleteAllTracks();
-
   /**
    * The current sensor data.
    * The data is returned as a byte array which is a binary version of a