tree 61dad3277c173e6e271ab661ddf6f6f60947160c
parent 8d4164f92f30d039bcc9a83e47d4be2dbef50b1b
parent aec7a0a165b745b485cf897b296dacc3af1d773e
author Martijn Coenen <maco@google.com> 1557211261 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1557211261 +0000

Merge "Stop using trigger_reset_main."