Merge heads

MyTracks/src/com/google/android/apps/mytracks/util/Api7Adapter.java

@@ -32,6 +32,7 @@ import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.util.Log;
 import android.view.MenuItem;
+import android.view.View;
 import android.view.Window;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
@@ -146,6 +147,16 @@ public class Api7Adapter implements ApiAdapter {
     }
   }
 
+  @Override
+  public void invalidMenu(Activity activity) {
+    // Do nothing
+  }
+
+  @Override
+  public void disableHardwareAccelerated(View view) {
+    // Do nothing
+  }
+
   @Override
   public boolean handleSearchKey(MenuItem menuItem) {
     // Return false and allow the framework to handle the search key.