OSDN Git Service

Merge "Ensure known good state when starting." into nyc-mr1-dev
authorErik Kline <ek@google.com>
Tue, 23 Aug 2016 14:22:40 +0000 (14:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 Aug 2016 14:22:40 +0000 (14:22 +0000)
am: e845cf22c1

Change-Id: Ic7901eebfe82855f67fd070501040829f39cb313


Trivial merge