commit 953d1d4b87c5460c259df3bf3defe988a2792e37
author Ihab Awad <ihab@google.com> Sat Mar 22 03:53:52 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Mar 22 03:53:52 2014 +0000
tree 5baa1ccec73f81fdb56d9dc126231475cf35c14b
parent 43bd98e5171b3e8ccf413021fb90b24526dd4168
parent b7f61da71b8ce161b275bf4c2a6ff771ad63848d

am b7f61da7: am 7fa4c759: DO NOT MERGE. Fix merge artifact.

* commit 'b7f61da71b8ce161b275bf4c2a6ff771ad63848d':
  DO NOT MERGE. Fix merge artifact.

src/com/android/dialer/DialtactsActivity.java

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 5294deb..ade5199 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -345,7 +345,6 @@
         }
 
         hideDialpadFragment(false, false);
-        setupFakeActionBarItems();
 
         mDialerDatabaseHelper = DatabaseHelperManager.getDatabaseHelper(this);
         SmartDialPrefix.initializeNanpSettings(this);