tree 1b639ff4b36b7f46e1bd1b01aec8b74d4429c68f
parent ac62753649c5a9c9e445d96c5628038ae1d3803a
parent 19e74b3d1fb033a4dda3e55e04239c6feb10863e
author Martijn Coenen <maco@google.com> 1557212508 -0700
committer android-build-merger <android-build-merger@google.com> 1557212508 -0700

Merge "Stop using trigger_reset_main." am: 91a6c016ec
am: 19e74b3d1f

Change-Id: Ic1b955827da8e13e60734bd4fbbad7523ac97561