commit d6a3bafd12977acc282017fbaa3d06a03a8906c4
author Colin Cross <ccross@android.com> Mon May 14 18:03:55 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon May 14 18:03:55 2018 -0700
tree 2ced2f72d126deb77478f5c207c2ee309d5f5d13
parent f68e5665bf8728342685bd8ea843d4bda03cfde3
parent 2743c5bb09b7b6a39ab4debff316f8953e51eb01

Merge "Fix errors caught by aapt2" am: 5d58a302e3
am: 2743c5bb09

Change-Id: I84dbf6e0fbfe8e2730ffa3fa79c3ef732702e192

media/tests/NativeMidiDemo/AndroidManifest.xml

diff --git a/media/tests/NativeMidiDemo/AndroidManifest.xml b/media/tests/NativeMidiDemo/AndroidManifest.xml
index 322873f..d083105 100644
--- a/media/tests/NativeMidiDemo/AndroidManifest.xml
+++ b/media/tests/NativeMidiDemo/AndroidManifest.xml
@@ -3,12 +3,12 @@
           package="com.example.android.nativemididemo"
           android:versionCode="1"
           android:versionName="1.0">
+  <uses-feature android:name="android.software.midi" android:required="true"/>
   <application
       android:allowBackup="false"
       android:fullBackupContent="false"
       android:icon="@mipmap/ic_launcher"
       android:label="@string/app_name">
-    <uses-feature android:name="android.software.midi" android:required="true"/>
     <activity android:name=".NativeMidi"
               android:label="@string/app_name">
       <intent-filter>