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)
* commit '4f362dfe593f4c8638873c3e7f9a53041bf3edd2':
  Cleanup Bluetooth AdapterService JNI


Trivial merge