tree 4af5d9ca64e5ff8c943ea098f1bfec477bd1e7be
parent 98562ebdf7bd84be34edb0fe9eaf6188012c749f
parent 3b15f44041dff58fc60678cac9dab675ab7c0fd0
author Keun-young Park <keunyoung@google.com> 1499361749 +0000
committer android-build-merger <android-build-merger@google.com> 1499361749 +0000

Merge "add "shutdown critical" to service" into oc-dr1-dev
am: 3b15f44041

Change-Id: I7b70303637913a43d717bb206a2bd6be82c9781f