Merge "Stop using trigger_reset_main." am: 91a6c016ec

am: 19e74b3d1f

Change-Id: Ic1b955827da8e13e60734bd4fbbad7523ac97561
gugelfrei
Martijn Coenen 5 years ago committed by android-build-merger
commit 676e2e0221

Diff Content Not Available