Merge "More correct startup and shutdown procedures." am: 8a825051a2 am: 7b5f0a82d0

am: 84a2a19c36

Change-Id: I8c1e0b235808635a910262a65530e655408cc5d8
This commit is contained in:
Erik Kline
2016-12-15 05:40:17 +00:00
committed by android-build-merger

Diff Content Not Available