tree 2096d7cee4735c8fbc249086c6a9ba7509442d5c
parent 31c3b4ac85b81a96b895834d9d428fd7e3e3e47a
parent c2a9136c517d2d78858f5a704f219e6fa0f7cee8
author Tom Cherry <tomcherry@google.com> 1494348582 +0000
committer android-build-merger <android-build-merger@google.com> 1494348582 +0000

Merge "init: remove restorecon() from util.cpp" am: 035b0c26e6
am: c2a9136c51

Change-Id: I93f8eabdba8002d3d864ac4337826adf9db8890d