tree 61dad3277c173e6e271ab661ddf6f6f60947160c
parent 7d9a965419ed4d514e45d6c15d40515e716b2395
parent 91a6c016ece26c11f1ff645d6719d0b626ba5b24
author Martijn Coenen <maco@google.com> 1557212232 -0700
committer android-build-merger <android-build-merger@google.com> 1557212232 -0700

Merge "Stop using trigger_reset_main."
am: 91a6c016ec

Change-Id: Id4baa15b619a941c7059d19c59645a45b9060433