am 45b3c498: Merge "Add required permission to sample code"

* commit '45b3c498c4bc78e9949fedd1dc4ce4fdb7cea340':
  Add required permission to sample code
This commit is contained in:
Andrew Hsieh
2014-09-04 19:48:30 +00:00
committed by Android Git Automerger

View File

@@ -2,6 +2,10 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.nativemedia">
<!-- INTERNET is needed to use a URI-based media player, depending on the URI -->
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"></uses-permission>
<uses-feature android:glEsVersion="0x00020000" />
<application android:icon="@drawable/icon" android:label="@string/app_name">
@@ -17,7 +21,4 @@
<uses-sdk android:minSdkVersion="14" />
<!-- INTERNET is needed to use a URI-based media player, depending on the URI -->
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
</manifest>