| commit | 94cee247c5f24d382c9b81b26e66eea867904c4a | [log] [tgz] |
|---|---|---|
| author | Jeongik Cha <jeongik@google.com> | Mon May 20 08:07:01 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 20 08:07:01 2024 +0000 |
| tree | b316824f040b4a9882c6226a96893446143ff3c6 | |
| parent | 5909a4686399578b17ffd6ed4021cbaefb2ed5fd [diff] | |
| parent | cc02cb9a7eed8f0328161fe1a30c105576af5f69 [diff] |
replace FrameLayout with merge tag am: cc02cb9a7e Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3093762 Change-Id: I1a6829f9a5144013f388d27dc5462897aac4ae07 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/vmlauncher_app/res/layout/activity_main.xml b/vmlauncher_app/res/layout/activity_main.xml index c588b19..e52dfcd 100644 --- a/vmlauncher_app/res/layout/activity_main.xml +++ b/vmlauncher_app/res/layout/activity_main.xml
@@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" +<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" @@ -21,4 +21,4 @@ <requestFocus /> </SurfaceView> -</FrameLayout> +</merge>