[Android] Fix about layout integration

[Geoffrey Métais]

vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Wed Apr 25 11:56:25 2018 +0200| [d1ace5de2415e3ddbaf32637fc8765cd55d80a2a] | committer: Geoffrey Métais

Fix about layout integration

> https://code.videolan.org/videolan/vlc-android/commit/d1ace5de2415e3ddbaf32637fc8765cd55d80a2a
---

 vlc-android/res/layout/about_main.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vlc-android/res/layout/about_main.xml b/vlc-android/res/layout/about_main.xml
index 5e276a039..1de68b830 100644
--- a/vlc-android/res/layout/about_main.xml
+++ b/vlc-android/res/layout/about_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"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
     <ScrollView
@@ -113,4 +113,4 @@
     </ScrollView>
 
     <include layout="@layout/tv_time" />
-</FrameLayout>
+</merge>