OSDN Git Service

Merge commit '7e701dbd4375ee00c3b72d4bda970d444f20c470' into manual_merge_7e701db
authorAndre Eisenbach <eisenbach@google.com>
Thu, 29 Sep 2016 00:26:14 +0000 (17:26 -0700)
committerAndre Eisenbach <eisenbach@google.com>
Thu, 29 Sep 2016 00:26:14 +0000 (17:26 -0700)
commite49037a792a2381cd30255d922ff8cb20d36bbaf
tree4ccf24ed19180b07476a5275dd84dc30fab21339
parent086cd130cbd54c2947bf418d40df3e8049227430
parent7e701dbd4375ee00c3b72d4bda970d444f20c470
Merge commit '7e701dbd4375ee00c3b72d4bda970d444f20c470' into manual_merge_7e701db

Change-Id: I12e74839725fe33e6739517e454a0941aa4bd986
stack/btm/btm_ble.c
stack/btm/btm_dev.c
stack/btm/btm_int.h