OSDN Git Service

Merge changes from topic "am-94f6d099-67a7-4fc1-95d1-65272646c688" into nyc-mr1-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)
* changes:
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 4375ef1784 am: 11efe10880
  [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)

1  2 
stack/sdp/sdp_discovery.c

Simple merge