diff options
| author | Andrew Lee <anwlee@google.com> | 2014-06-04 14:02:48 -0700 |
|---|---|---|
| committer | Andrew Lee <anwlee@google.com> | 2014-06-04 14:02:48 -0700 |
| commit | d871e55135489cb2090287acd757bfb5976beacb (patch) | |
| tree | 86f956c5f4e9ef10b6caf00457c8ff06b2c9a8b2 /res/layout | |
| parent | 9c8d7660f0eee0a0e470f459a0748f1f89bdcd13 (diff) | |
| parent | 4d1357676c097716a88a3e1e590045882ca3ec8d (diff) | |
resolved conflicts for merge of 4d135767 to master
Change-Id: I8b156297f69e4ac629f72e1f3af92e06aa8652a5
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/search_edittext.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/layout/search_edittext.xml b/res/layout/search_edittext.xml index 9b8031efe..0308d5177 100644 --- a/res/layout/search_edittext.xml +++ b/res/layout/search_edittext.xml @@ -77,4 +77,4 @@ <include layout="@layout/search_bar_expanded" /> -</view>
\ No newline at end of file +</view> |