Merge "Merge "add "shutdown critical" to service" am: b3915d113d am: a4ad5d0328" into oc-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role) 2017-07-06 00:57:11 +00:00 committed by Android (Google) Code Review
commit 61ce9b3bad

Diff content is not available