OSDN Git Service

resolved conflicts for merge of c508483d to jb-mr2-dev
authorBrian Carlstrom <bdc@google.com>
Tue, 12 Mar 2013 06:47:55 +0000 (23:47 -0700)
committerBrian Carlstrom <bdc@google.com>
Tue, 12 Mar 2013 06:50:26 +0000 (23:50 -0700)
commitb241cda1eec2fbefd6d21e0819532f7a76947635
tree661694b626732458ea8f97b7fb13e2a4c3cdecca
parent03b8386de26ba6500af2d66687bff9b01f2cbbd7
resolved conflicts for merge of c508483d to jb-mr2-dev

Change-Id: I7f32e6dd98c3cc61030cded700587aa852c0fc0a
jni/com_android_bluetooth_btservice_AdapterService.cpp