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)
am: 5ebcaf1bb0

Change-Id: I2e51acc6d0c83fd8d3865cdae676e33111d494ee


Trivial merge