| commit | b22c41fab57ef358116bb5b5e6fefa86e9077bfd | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Fri Mar 29 14:34:59 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 29 14:34:59 2013 -0700 |
| tree | 5d205ee518791a58d771b2285065b31a3f416999 | |
| parent | 8ddb0841a785c62e6a09060bcf1d7616c4a82979 [diff] | |
| parent | 4f362dfe593f4c8638873c3e7f9a53041bf3edd2 [diff] |
am 4f362dfe: resolved conflicts for merge of c508483d to jb-mr2-dev * commit '4f362dfe593f4c8638873c3e7f9a53041bf3edd2': Cleanup Bluetooth AdapterService JNI