tree 4100b0dbb9cca4a8078a5c0a774bdadcc16c787b
parent 2c84e2ae40d27304e3f1dd525de77167412aa3f1
parent 6ac577230bbb2ed3670a9af51c8ba2a624e9988f
author Tom Cherry <tomcherry@google.com> 1494350622 +0000
committer android-build-merger <android-build-merger@google.com> 1494350622 +0000

Merge "init: remove restorecon() from util.cpp" am: 035b0c26e6 am: c2a9136c51
am: 6ac577230b  -s ours

Change-Id: I328600a2c439ecf1a7d482c4eb04a2ca07519322