commit | 1065734635cd87fe7fac60242c7634c30c3296a4 | [log] [tgz] |
---|---|---|
author | Erik Kline <ek@google.com> | Thu Dec 15 05:47:25 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Dec 15 05:47:25 2016 +0000 |
tree | e2f42eac34e971d2eaedb34c71ee3158dbec4a36 | |
parent | 6bc381c51a238a935c2fa4b3e79340bc1bdb45e9 [diff] | |
parent | 579c86f622e20e6a108005ba00bcb9602fcaf6ee [diff] |
Merge "More correct startup and shutdown procedures." am: 618d4215a2 am: b6588f9a41 am: 7074b562d9 am: 579c86f622 Change-Id: Ia55c27ee51892a7dc29f2e1f1379eb8312cf3cb3