tree 9f20ee9f271bee102751178e2619876f1ee9503e
parent e6e8c7a1dd953f4910830bf0c6818d5b7092911f
parent dcf63748fc9681288093161e99d6437eacd6927c
author Paul Lawrence <paullawrence@google.com> 1486060302 +0000
committer android-build-merger <android-build-merger@google.com> 1486060302 +0000

Merge "Install seccomp into zygote not init" am: ba9bbd8517
am: dcf63748fc

Change-Id: I7cb6ff86a8466aa0ca45691b2d169b4b7467bd9a