diff options
| author | Romain Guy <romainguy@google.com> | 2012-10-17 12:39:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-17 12:39:57 -0700 |
| commit | 2eaf66b6169c6e7447c27124b625bc82fc9a2661 (patch) | |
| tree | 7d9d340f1da2fb2db4a7ea5db69bd2035088bb86 /res | |
| parent | 3e1f0f13374f012e88d6ff1c99a0cdbfb380b306 (diff) | |
| parent | b2d329449fee25c2b98fa6e85f12510e1be1c03e (diff) | |
| download | android_packages_screensavers_PhotoTable-2eaf66b6169c6e7447c27124b625bc82fc9a2661.tar.gz android_packages_screensavers_PhotoTable-2eaf66b6169c6e7447c27124b625bc82fc9a2661.tar.bz2 android_packages_screensavers_PhotoTable-2eaf66b6169c6e7447c27124b625bc82fc9a2661.zip | |
am b2d32944: am f24e9d13: am c688f887: Add missing layout attributes Bug #7334849
* commit 'b2d329449fee25c2b98fa6e85f12510e1be1c03e':
Add missing layout attributes Bug #7334849
Diffstat (limited to 'res')
| -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> |