commit | 1b3a4362a08d816d78fdbb04ef115b31c8674420 | [log] [tgz] |
---|---|---|
author | Martijn Coenen <maco@google.com> | Fri Nov 30 11:11:44 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 30 11:11:44 2012 -0800 |
tree | 0d213a8218d856824b44b768a6d5eead3ac9bfab | |
parent | 7b1af76074423837d26ccb4e3b4c1b5d25baa25e [diff] | |
parent | f77445cd48f9174647c4c7ff539036b5aa08ce6e [diff] |
am f77445cd: am b1a01ab0: Merge "Allow the NFC process to call Bluetooth APIs." into jb-mr1.1-dev * commit 'f77445cd48f9174647c4c7ff539036b5aa08ce6e': Allow the NFC process to call Bluetooth APIs.