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)
am: 91a6c016ec

Change-Id: Id4baa15b619a941c7059d19c59645a45b9060433


Trivial merge