OSDN Git Service

Merge changes from topic 'svcmgr_shutdown_critical' into oc-dr1-dev
authorWei Wang <wvw@google.com>
Tue, 11 Jul 2017 19:56:03 +0000 (19:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Jul 2017 19:56:03 +0000 (19:56 +0000)
commit546aa9b19bf923cc693e6940c2ec6fe63b3a1500
tree65c881545ea71b70f56f69b95d1f510f67ee6c13
parent2c65dd96dc3531af69134476bedc51ffedb433e2
parent5ebcaf1bb09dbf2f7375163997acd843a0e5780a
Merge changes from topic 'svcmgr_shutdown_critical' into oc-dr1-dev
am: 5ebcaf1bb0

Change-Id: I2e51acc6d0c83fd8d3865cdae676e33111d494ee