commit | 7074b562d9ac46db11bf67a66117ea8c4f31ebf3 | [log] [tgz] |
---|---|---|
author | Erik Kline <ek@google.com> | Thu Dec 15 05:32:50 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Dec 15 05:32:50 2016 +0000 |
tree | f9b55c2e1c8e4272798198c3cdd4d063e7c6259a | |
parent | 85785b557ac897cad031cff3f23e17731aecc260 [diff] | |
parent | b6588f9a41618a5ed347805350eb5e49871a6f2b [diff] |
Merge "More correct startup and shutdown procedures." am: 618d4215a2 am: b6588f9a41 Change-Id: I8a2bcab3b9373d2573601fa3bffa123020b3fbae