tree ab47df5c011228aaf2a9e187d19711a7a8a7096e
parent 8e6f6a5cebf023905b37b0fc80d3ceec262a0d91
parent 228b95fa150ab7131ef645dcc9fcc3f1ede22b1a
author Keun-young Park <keunyoung@google.com> 1499302581 +0000
committer android-build-merger <android-build-merger@google.com> 1499302581 +0000

Merge "add vold to "shutdown critical"" am: da85cb71b3
am: 228b95fa15

Change-Id: I0de967657d969f54dedddbb2b72ab07ed650e2e3