OSDN Git Service

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

Change-Id: I1a1fc90b0b5d15315ada952005c6290ecca3d47f


Trivial merge