From 172aed44abf1753446d53fb6e016dfcec28e0f6e Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Tue, 17 Apr 2012 12:30:56 -0700
Subject: [PATCH] fix merge conflict

---
 .../com/google/android/apps/mytracks/MarkerListActivity.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java
index 03c9f6480..3cc15c575 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java
@@ -167,7 +167,7 @@ public class MarkerListActivity extends FragmentActivity {
       }
     };
     listView.setAdapter(resourceCursorAdapter);
-    ApiAdapterFactory.getApiAdapter().configureContextualMenu(
+    ApiAdapterFactory.getApiAdapter().configureListViewContextualMenu(
         this, listView, R.menu.marker_list_context_menu, R.id.marker_list_item_name,
         contextualActionModeCallback);