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

am: f61f77a380

Change-Id: Ia55c27ee51892a7dc29f2e1f1379eb8312cf3cb3
This commit is contained in:
Erik Kline
2016-12-15 05:47:25 +00:00
committed by android-build-merger

Diff Content Not Available