OSDN Git Service

resolved conflicts for merge of a3d3c312 to mnc-dr-dev-plus-aosp
authorPavlin Radoslavov <pavlin@google.com>
Mon, 24 Aug 2015 06:47:11 +0000 (23:47 -0700)
committerPavlin Radoslavov <pavlin@google.com>
Mon, 24 Aug 2015 06:47:11 +0000 (23:47 -0700)
commite8e565146a0be1f84de2e49269e8b7876640d308
treefed511b14fbfe2423e33a5e592dc28d8d1f13e26
parent3528fb962b02d6a355a6a792593f97e6d85055d8
parenta3d3c3121e24c35611a20cf22b4f4e42742ee286
resolved conflicts for merge of a3d3c312 to mnc-dr-dev-plus-aosp

Change-Id: I98a27cd20ed225ad278af9f2b27b6e954a55f7a7
hci/src/hci_hal_h4.c