Merge "Ensure known good state when starting." into nyc-mr1-dev am: e845cf22c1

am: 31ef78878e

Change-Id: I29381e3438229a0d628a6017cd8bf143c55457f3
This commit is contained in:
Erik Kline
2016-08-23 14:32:12 +00:00
committed by android-build-merger

Diff Content Not Available