Clean up permissions

demo/src/main/AndroidManifest.xml

@@ -21,9 +21,7 @@
     android:theme="@style/RootTheme">
 
   <uses-permission android:name="android.permission.INTERNET"/>
-  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 
   <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22"/>
 

demo_misc/webm_sw_decoder/src/main/AndroidManifest.xml

@@ -20,8 +20,8 @@
     android:versionName="1.0"
     android:theme="@style/RootTheme">
 
-  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
   <uses-permission android:name="android.permission.INTERNET"/>
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 
   <uses-feature android:glEsVersion="0x00020000"></uses-feature>
 

library/src/main/AndroidManifest.xml

@@ -17,9 +17,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.exoplayer">
 
+  <!-- For streaming media over the network. -->
   <uses-permission android:name="android.permission.INTERNET"/>
-  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+  <!-- For reading media from external storage. -->
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+  <!-- For writing media to external storage. -->
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
   <!--