OSDN Git Service

Merge "HSP: Use peer_version during SCO setup" am: 5519f0d619 am: f941095d46
authorJack He <siyuanh@google.com>
Sat, 27 May 2017 02:07:21 +0000 (02:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 27 May 2017 02:07:21 +0000 (02:07 +0000)
am: 0b4b111030

Change-Id: Ied16a4e7ec67ae36f326b75a16adbccb003a94f9


Trivial merge