OSDN Git Service

Merge changes from topic "am-94f6d099-67a7-4fc1-95d1-65272646c688" into nyc-dr1-dev
authorAtanas Kirilov <akirilov@google.com>
Thu, 31 May 2018 22:04:38 +0000 (22:04 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 31 May 2018 22:04:38 +0000 (22:04 +0000)
commitc583f8117fdf015172ca5045a01063430ab803cf
tree7ea641c79cd7e56b89780e02a791150236a86a47
parenta1d3d6493f2c47a255ee85d2aabbcfc2ed006665
parent11efe1088053ca7419262602dcfc960068e139a9
Merge changes from topic "am-94f6d099-67a7-4fc1-95d1-65272646c688" into nyc-dr1-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 4375ef1784
  RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)
stack/sdp/sdp_discovery.c