diff options
author | Ihab Awad <ihab@google.com> | 2014-03-24 19:44:25 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-24 19:44:25 +0000 |
commit | 0ecedf6b2e7da78f4c22ea07be6789a71ba2d8f0 (patch) | |
tree | e917e788e0bc959ba7a6d4ef8b73f98cd4bb503e | |
parent | 7f2927a09dd19f5368bbc1e042c86f9c3da2ddb2 (diff) | |
parent | b7f61da71b8ce161b275bf4c2a6ff771ad63848d (diff) |
am b7f61da7: am 7fa4c759: DO NOT MERGE. Fix merge artifact.
* commit 'b7f61da71b8ce161b275bf4c2a6ff771ad63848d':
DO NOT MERGE. Fix merge artifact.
-rw-r--r-- | src/com/android/dialer/DialtactsActivity.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index 6ea004d11..0b342d277 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -323,7 +323,6 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O } hideDialpadFragment(false, false); - setupFakeActionBarItems(); mDialerDatabaseHelper = DatabaseHelperManager.getDatabaseHelper(this); SmartDialPrefix.initializeNanpSettings(this); |