Fix 5514384: add video/avi as a supported mime type.

Change-Id: I197711a1ef0f5b6356573944c3012c6a14905579
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 11e59ab..798a46e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -52,6 +52,7 @@
                 <data android:mimeType="video/3gpp" />
                 <data android:mimeType="video/3gpp2" />
                 <data android:mimeType="video/webm" />
+                <data android:mimeType="video/avi" />
                 <data android:mimeType="application/sdp" />
              </intent-filter>
              <intent-filter>
@@ -144,7 +145,7 @@
         <activity-alias android:name="com.cooliris.media.Gallery"
                 android:targetActivity="com.android.gallery3d.app.Gallery"
                 android:configChanges="keyboardHidden|orientation|screenSize"
-                android:label="string/app_name">
+                android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>