OSDN Git Service

am 4f362dfe: resolved conflicts for merge of c508483d to jb-mr2-dev
authorBrian Carlstrom <bdc@google.com>
Fri, 29 Mar 2013 21:34:59 +0000 (14:34 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 29 Mar 2013 21:34:59 +0000 (14:34 -0700)
commitb22c41fab57ef358116bb5b5e6fefa86e9077bfd
tree5d205ee518791a58d771b2285065b31a3f416999
parent8ddb0841a785c62e6a09060bcf1d7616c4a82979
parent4f362dfe593f4c8638873c3e7f9a53041bf3edd2
am 4f362dfe: resolved conflicts for merge of c508483d to jb-mr2-dev

* commit '4f362dfe593f4c8638873c3e7f9a53041bf3edd2':
  Cleanup Bluetooth AdapterService JNI