tree 068d2ec6a5b321472eacec7a70f5dc4f06f5986a
parent 0c731860f915b8c3f7c226c1b7c7a8d97513545d
parent 872acd734f56da61cfb7f0d6324d5f73fc2399ae
author Tom Cherry <tomcherry@google.com> 1494355421 +0000
committer android-build-merger <android-build-merger@google.com> 1494355421 +0000

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

Change-Id: I865518d0e93ce2d5a785b1311f9bf98931aa7b94