Merge pull request #115 from google/dev

Use largeHeap in demo app

demo/src/main/AndroidManifest.xml

@@ -29,7 +29,8 @@
 
 
   <application
   <application
       android:label="@string/application_name"
       android:label="@string/application_name"
-      android:allowBackup="true">
+      android:largeHeap="true"
+      android:allowBackup="false">
 
 
     <activity android:name="com.google.android.exoplayer.demo.SampleChooserActivity"
     <activity android:name="com.google.android.exoplayer.demo.SampleChooserActivity"
         android:configChanges="keyboardHidden"
         android:configChanges="keyboardHidden"