OSDN Git Service

[automerger skipped] [automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_...
authorHansong Zhang <hsz@google.com>
Thu, 31 May 2018 22:28:26 +0000 (15:28 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 31 May 2018 22:28:26 +0000 (15:28 -0700)
am: 6a5fe4c62a  -s ours

Change-Id: Icffaf12576f38fc7adacec0f4960079dcec44db0


Trivial merge