OSDN Git Service

Merge "Stop using trigger_reset_main."
authorMartijn Coenen <maco@google.com>
Tue, 7 May 2019 06:57:12 +0000 (23:57 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 7 May 2019 06:57:12 +0000 (23:57 -0700)
commit19e74b3d1fb033a4dda3e55e04239c6feb10863e
tree61dad3277c173e6e271ab661ddf6f6f60947160c
parent7d9a965419ed4d514e45d6c15d40515e716b2395
parent91a6c016ece26c11f1ff645d6719d0b626ba5b24
Merge "Stop using trigger_reset_main."
am: 91a6c016ec

Change-Id: Id4baa15b619a941c7059d19c59645a45b9060433