summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Attwell <brianattwell@google.com>2014-09-05 22:35:37 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-05 22:35:37 +0000
commit431cf80cd948b930e2147cb88e0243400055c966 (patch)
treeeadc811576987926929db9c09f6ec6d188abab4c
parent2d5fc2c9831bb96b95c9553e26d574758fa3f252 (diff)
parent8be85c826eb66dfd6f48b7fb79286f699d47e1cb (diff)
am 8be85c82: Merge "Don\'t set the same viewId twice" into lmp-dev
* commit '8be85c826eb66dfd6f48b7fb79286f699d47e1cb': Don't set the same viewId twice
-rw-r--r--res/layout/show_all_contacts_fragment.xml4
1 files changed, 1 insertions, 3 deletions
diff --git a/res/layout/show_all_contacts_fragment.xml b/res/layout/show_all_contacts_fragment.xml
index fe188bddd..00358dc47 100644
--- a/res/layout/show_all_contacts_fragment.xml
+++ b/res/layout/show_all_contacts_fragment.xml
@@ -24,9 +24,7 @@
<!-- Shown only when an Account filter is set.
- paddingTop should be here to show "shade" effect correctly. -->
<!-- TODO: Remove the filter header. -->
- <include
- android:id="@+id/account_filter_header_container"
- layout="@layout/account_filter_header" />
+ <include layout="@layout/account_filter_header" />
<FrameLayout
android:layout_width="match_parent"