tree 561d088cea9569cd301bed8bbec175fa160bba40
parent b69dd8bb9842243846b4f4b81b5303450afa0fbf
parent f39281b68ce89545cff1f2c00d9b5552fe3b8ad1
author Keun-young Park <keunyoung@google.com> 1499305172 +0000
committer android-build-merger <android-build-merger@google.com> 1499305172 +0000

Merge "Merge "add vold to "shutdown critical"" am: da85cb71b3 am: 228b95fa15 am: 733fe09928" into oc-dr1-dev-plus-aosp
am: f39281b68c

Change-Id: I142be6c019cd9a3f8f212a2bbc97842cd04cf6eb