From: Wei Wang <wvw@google.com>
Date: Tue, 11 Jul 2017 19:59:40 +0000 (+0000)
Subject: Merge changes from topic 'svcmgr_shutdown_critical' into oc-dr1-dev am: 5ebcaf1bb0
X-Git-Tag: android-x86-9.0-r1~281
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=47055bfdd3de5a5677b3411256fa77494aa7aa12;p=android-x86%2Fframeworks-native.git

Merge changes from topic 'svcmgr_shutdown_critical' into oc-dr1-dev am: 5ebcaf1bb0
am: 546aa9b19b

Change-Id: I4fb053426ef70e6012ee47797d2a368bdf633ba9
---

47055bfdd3de5a5677b3411256fa77494aa7aa12