tree 93942e14faa25c1747cf81776ddf4aa6ab4965dc
parent a457c32fa9e48f4f07bf8c9ad668ebae65aca492
parent 08228116a88ecc3fccd2265054de5e2fc776b4d3
author Tom Cherry <tomcherry@google.com> 1502729401 +0000
committer android-build-merger <android-build-merger@google.com> 1502729401 +0000

Merge "init: split security functions out of init.cpp" into oc-dev-plus-aosp
am: 08228116a8

Change-Id: I3fc6288cf03cd1e262852ceb3fc9dbcedb32c7c3