OSDN Git Service

Merge changes I693b0596,Ib5a05c47,I1da213fd,I32cd6412,If62f334d, ... into nyc-dev
authorNitin Arora <niarora@codeaurora.org>
Wed, 11 May 2016 18:23:09 +0000 (18:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 May 2016 18:23:09 +0000 (18:23 +0000)
commit067757615e9ffb054fd93b44d2bcd07f5dd622a0
tree1ee8be94971c989063d61b58f2833b95536fc9f1
parent00553a4b03ccf8f8fe67510595898fe0274d02c9
parentc04eb3d3bc80e056af87bc3a82037d145d99937e
Merge changes I693b0596,Ib5a05c47,I1da213fd,I32cd6412,If62f334d, ... into nyc-dev
am: c04eb3d3bc

* commit 'c04eb3d3bc80e056af87bc3a82037d145d99937e':
  PTS: Read SMP pairing options from bt_stack.conf
  PTS: Avoid BR SDP after LE pairing
  PTS: Allow disabling connection updates
  PTS: Add a Secure Only mode.
  Changes to allow LE key upgrade
  Allow C++ code to check bt_stack_config options

Change-Id: I00d0ff2c0e8393cca6a14788dd07420f0de67290