OSDN Git Service

resolved conflicts for merge of 1f81b64b to mnc-dev-plus-aosp
authorIan Coolidge <icoolidge@google.com>
Thu, 28 May 2015 16:53:38 +0000 (09:53 -0700)
committerIan Coolidge <icoolidge@google.com>
Thu, 28 May 2015 16:53:38 +0000 (09:53 -0700)
commitb959a4070b56c9b08132eb8756759046c24c1384
tree369e9af3d3092dcedf69b6d1d571c4dc4592cc81
parent12537f7bf197ba3a68e24744b8d92f18afe97c6d
parent1f81b64b337832452e9ba1f530e612a685aebb82
resolved conflicts for merge of 1f81b64b to mnc-dev-plus-aosp

Change-Id: I7997086b1d83bc5ee06068f82ca31c290389bc44
btif/src/bluetooth.c
device/src/controller.c
hci/src/btsnoop.c
osi/Android.mk