summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorMangesh Ghiware <mghiware@google.com>2012-10-25 17:44:54 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-25 17:44:55 -0700
commit5388677d3078f2c218d22465c955e3df6b2ffbed (patch)
tree50af8bfbb73d48f76e7a19ca3a30dde8d547dbb7 /AndroidManifest.xml
parent4164fabf5f9324adde9954130aad13c2f72aa24a (diff)
parent07b70a524d4188120153eee5da31b079ecb135ed (diff)
downloadandroid_packages_apps_Gallery2-5388677d3078f2c218d22465c955e3df6b2ffbed.tar.gz
android_packages_apps_Gallery2-5388677d3078f2c218d22465c955e3df6b2ffbed.tar.bz2
android_packages_apps_Gallery2-5388677d3078f2c218d22465c955e3df6b2ffbed.zip
Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b147aa1c1..7a7e04466 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -125,6 +125,7 @@
<data android:mimeType="image/png" />
<data android:mimeType="image/x-ms-bmp" />
<data android:mimeType="image/vnd.wap.wbmp" />
+ <data android:mimeType="application/vnd.google.panorama360+jpg" />
</intent-filter>
<intent-filter>
<action android:name="com.android.camera.action.REVIEW" />