summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Attwell <brianattwell@google.com>2014-09-05 22:45:48 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-05 22:45:48 +0000
commit742d8310376435ae840532a9c1bcaec0338b8e12 (patch)
tree3c089650e351957b4a6e7826b753bf00374ab459
parentc8d7f661bb44eaaa5d032cf1a9431aa1babc30ac (diff)
parentb2dbce564ae770bb72eb62d308f465d2915b7755 (diff)
am b2dbce56: am 8be85c82: Merge "Don\'t set the same viewId twice" into lmp-dev
* commit 'b2dbce564ae770bb72eb62d308f465d2915b7755': 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"