OSDN Git Service

Merge "Ensure known good state when starting." into nyc-mr1-dev
authorErik Kline <ek@google.com>
Mon, 22 Aug 2016 02:55:39 +0000 (02:55 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 22 Aug 2016 02:55:41 +0000 (02:55 +0000)

Trivial merge