tree 93942e14faa25c1747cf81776ddf4aa6ab4965dc
parent 3b3d1ab7e5b2b8152f310d630929cc565367cdaa
parent da8e47903ce883c42e90352f906116f0a1353c68
author Tom Cherry <tomcherry@google.com> 1502737059 +0000
committer android-build-merger <android-build-merger@google.com> 1502737059 +0000

Merge "init: split security functions out of init.cpp" into stage-aosp-master am: 9e16932c04  -s ours
am: da8e47903c  -s ours

Change-Id: I390d3b261dd97ab8935ae71ccd26b7d5b4f9aed6