From eb81da7f2d503fa06f26fe4aed5d617d1f9177e2 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 28 Nov 2016 09:59:05 -0800
Subject: [PATCH] Remove unnecessary layer in view hierarchy

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=140369506
---
 library/src/main/res/layout/exo_simple_player_view.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/library/src/main/res/layout/exo_simple_player_view.xml b/library/src/main/res/layout/exo_simple_player_view.xml
index b21b0d2bd6..1f59b7796d 100644
--- a/library/src/main/res/layout/exo_simple_player_view.xml
+++ b/library/src/main/res/layout/exo_simple_player_view.xml
@@ -13,9 +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"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent">
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
 
   <com.google.android.exoplayer2.ui.AspectRatioFrameLayout android:id="@id/exo_content_frame"
       android:layout_width="match_parent"
@@ -48,4 +46,4 @@
       android:layout_width="match_parent"
       android:layout_height="match_parent"/>
 
-</FrameLayout>
+</merge>