tree 561d088cea9569cd301bed8bbec175fa160bba40
parent 73a5b06578784f49ffb1ef766ebc29c4a9d297d0
parent 9045c86a32662586ad830cdb68d287fab0aed08e
author Keun-young Park <keunyoung@google.com> 1499305098 +0000
committer android-build-merger <android-build-merger@google.com> 1499305098 +0000

Merge "add vold to "shutdown critical"" am: da85cb71b3 am: 228b95fa15 am: 733fe09928
am: 9045c86a32

Change-Id: Ifa4795f87e6de808cbbf4e238d8a0a938ad1f8b9