tree bd379bef5e37df8bc07c1c627601dcfa44bae843
parent 1f6a481462ba334554680ef05932357fdf1b446c
parent d467db9b3d000e91717daccae0a13ba45cedb6ed
author Tom Cherry <tomcherry@google.com> 1502734415 +0000
committer android-build-merger <android-build-merger@google.com> 1502734415 +0000

Merge "init: split security functions out of init.cpp"
am: d467db9b3d  -s ours

Change-Id: I79efe02c3544224c13a6b5f037a8243add2c0eca