OSDN Git Service

Merge "More correct startup and shutdown procedures." am: 618d4215a2 am: b6588f9a41
authorErik Kline <ek@google.com>
Thu, 15 Dec 2016 05:40:17 +0000 (05:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 15 Dec 2016 05:40:17 +0000 (05:40 +0000)
am: 7074b562d9

Change-Id: I8c1e0b235808635a910262a65530e655408cc5d8


Trivial merge