OSDN Git Service

Merge changes from topic "am-052c6ecb-b5c1-4a10-9d60-0251d0e6f8d6" into cw-f-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Fri, 6 Apr 2018 22:30:25 +0000 (22:30 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 6 Apr 2018 22:30:25 +0000 (22:30 +0000)
* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 61c9430c58 am: 058e2df213 am: 917f3d5e22
  [automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 61c9430c58 am: 058e2df213
  [automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 61c9430c58
  DO NOT MERGE Fix unexpected behavior in smp_sm_event


Trivial merge