| commit | 82431cecda9c1e68c58028ea49f0059aef0dab21 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Sat Apr 25 23:49:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Apr 25 23:49:59 2015 +0000 |
| tree | 37ea7b046d99a398945e31c1188d41247d59ad18 | |
| parent | 0001d4fbaf09de60e550699e739cf27cac70280e [diff] | |
| parent | 2bc6e65d7ac443ac976aa7aac8c84bf601f85eaa [diff] |
am 2bc6e65d: Merge "Add hwp MIME type to transfer/receive over bluetooth" * commit '2bc6e65d7ac443ac976aa7aac8c84bf601f85eaa': Add hwp MIME type to transfer/receive over bluetooth