diff options
| author | Brian Attwell <brianattwell@google.com> | 2014-09-05 22:35:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-05 22:35:57 +0000 |
| commit | b2dbce564ae770bb72eb62d308f465d2915b7755 (patch) | |
| tree | 3c089650e351957b4a6e7826b753bf00374ab459 /res | |
| parent | 5a12fc309928e883a93554f17b1a519ed4dcfda4 (diff) | |
| parent | 8be85c826eb66dfd6f48b7fb79286f699d47e1cb (diff) | |
am 8be85c82: Merge "Don\'t set the same viewId twice" into lmp-dev
* commit '8be85c826eb66dfd6f48b7fb79286f699d47e1cb':
Don't set the same viewId twice
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/show_all_contacts_fragment.xml | 4 |
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" |