OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE Revert "DO NOT MERGE Separate SDP procedure...
authorMyles Watson <mylesgw@google.com>
Thu, 9 May 2019 19:19:21 +0000 (12:19 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 9 May 2019 19:19:21 +0000 (12:19 -0700)
am: c43cbc7075 -s ours
am skip reason: subject contains skip directive

Change-Id: I9693b38ac16ec7b6eeb6c6ef479a51e74ab0e09b


Trivial merge