diff options
| author | Ihab Awad <ihab@google.com> | 2014-03-24 19:53:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-24 19:53:46 +0000 |
| commit | 80703956c8a761aa447d768d7a5356eae47548d1 (patch) | |
| tree | e917e788e0bc959ba7a6d4ef8b73f98cd4bb503e | |
| parent | 55f8555ce63c650155ae71fac15f505e98c095a8 (diff) | |
| parent | 304b6f7b15e9c62293c705f3ac34c811f4326640 (diff) | |
am 304b6f7b: am 0ecedf6b: am b7f61da7: am 7fa4c759: DO NOT MERGE. Fix merge artifact.
* commit '304b6f7b15e9c62293c705f3ac34c811f4326640':
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); |