OSDN Git Service

Merge "DO NOT MERGE Fix unexpected behavior in smp_sm_event" into oc-dev
authorHansong Zhang <hsz@google.com>
Fri, 6 Apr 2018 23:52:54 +0000 (16:52 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Apr 2018 23:52:54 +0000 (16:52 -0700)
am: 9837db006d

Change-Id: I838951d04e7dc02ae37ba01644d7e32006cc1285


Trivial merge