diff options
| author | Romain Guy <romainguy@google.com> | 2012-10-17 12:35:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-17 12:35:00 -0700 |
| commit | f24e9d1391583f7e1bf65df039a73b2e2f2e4258 (patch) | |
| tree | 7d9d340f1da2fb2db4a7ea5db69bd2035088bb86 | |
| parent | d88149e6018eb69222c4c4005de6553031fd4677 (diff) | |
| parent | c688f887e6d18a1decc389f2b807e4497988dc61 (diff) | |
| download | PhotoTable-f24e9d1391583f7e1bf65df039a73b2e2f2e4258.tar.gz | |
am c688f887: Add missing layout attributes Bug #7334849
* commit 'c688f887e6d18a1decc389f2b807e4497988dc61':
Add missing layout attributes Bug #7334849
| -rw-r--r-- | res/layout/settingslist.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/layout/settingslist.xml b/res/layout/settingslist.xml index 114a789..1f2128b 100644 --- a/res/layout/settingslist.xml +++ b/res/layout/settingslist.xml @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"> + <merge xmlns:android="http://schemas.android.com/apk/res/android"> <ListView android:id="@android:id/list" android:layout_width="match_parent" @@ -29,4 +29,4 @@ android:layout_gravity="center" /> -</FrameLayout> +</merge> |