OSDN Git Service

Merge changes from topic 'svcmgr_shutdown_critical' into oc-dr1-dev am: 5ebcaf1bb0
authorWei Wang <wvw@google.com>
Tue, 11 Jul 2017 19:59:40 +0000 (19:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Jul 2017 19:59:40 +0000 (19:59 +0000)
am: 546aa9b19b

Change-Id: I4fb053426ef70e6012ee47797d2a368bdf633ba9


Trivial merge