tree dbd53dd1c4c352eea6da48c619fe618d4046e820
parent 9dfed40bd8ad90ebe8150d628d36ac8c3f1bd432
parent 7074b562d9ac46db11bf67a66117ea8c4f31ebf3
author Erik Kline <ek@google.com> 1481780417 +0000
committer android-build-merger <android-build-merger@google.com> 1481780417 +0000

Merge "More correct startup and shutdown procedures." am: 618d4215a2 am: b6588f9a41
am: 7074b562d9

Change-Id: I8c1e0b235808635a910262a65530e655408cc5d8