OSDN Git Service

Merge changes from topic "am-0ee00745-3175-4746-9daa-2f8a6e252eaa" into cw-e-dev
authorAtanas Kirilov <akirilov@google.com>
Thu, 31 May 2018 22:04:35 +0000 (22:04 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 31 May 2018 22:04:35 +0000 (22:04 +0000)
commite4f3a9ce4c2637ae8dd2841dc6366add6c61f050
tree174b49f1ce2cd3eae36b5c978f723258bf440873
parent16f166c5b74276759e2ae7e3b9213733cf714a54
parentc8367854c768dd168e0768dcddd645dc1850c481
Merge changes from topic "am-0ee00745-3175-4746-9daa-2f8a6e252eaa" into cw-e-dev

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