diff options
| author | Elliott Hughes <enh@google.com> | 2015-04-26 05:40:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-26 05:40:33 +0000 |
| commit | 6649a9dfaa405b240f5ef680fd8d7f4c279afcf1 (patch) | |
| tree | fd39f0ea353ae4412bfb56983d653990522484d5 /AndroidManifest.xml | |
| parent | 2d0a6eb3f7440a8fdf12d31fbf279e50d11991c8 (diff) | |
| parent | 82431cecda9c1e68c58028ea49f0059aef0dab21 (diff) | |
| download | android_packages_apps_Bluetooth-6649a9dfaa405b240f5ef680fd8d7f4c279afcf1.tar.gz android_packages_apps_Bluetooth-6649a9dfaa405b240f5ef680fd8d7f4c279afcf1.tar.bz2 android_packages_apps_Bluetooth-6649a9dfaa405b240f5ef680fd8d7f4c279afcf1.zip | |
am 82431cec: am 2bc6e65d: Merge "Add hwp MIME type to transfer/receive over bluetooth"
* commit '82431cecda9c1e68c58028ea49f0059aef0dab21':
Add hwp MIME type to transfer/receive over bluetooth
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5f35adead..3519370e2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -141,6 +141,7 @@ <data android:mimeType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" /> <data android:mimeType="application/vnd.openxmlformats-officedocument.wordprocessingml.document" /> <data android:mimeType="application/vnd.openxmlformats-officedocument.presentationml.presentation" /> + <data android:mimeType="application/x-hwp" /> </intent-filter> <intent-filter> <action android:name="android.intent.action.SEND_MULTIPLE" /> |