fix merge conflict

2012-04-17 12:30:56 -07:00
parent 09a6a0a604
commit 172aed44ab
1 changed files with 1 additions and 1 deletions
@@ -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);