tree 03d10a0380013e4832be95e9c632fb29a44325b1
parent b499944442c36457a103e9c24c1d8308d45102b9
parent c712aedb0c44cce46a8a2097f5ab2b1fbde3cd4d
author Paul Lawrence <paullawrence@google.com> 1488213960 +0000
committer android-build-merger <android-build-merger@google.com> 1488213960 +0000

Merge "Revert "Move seccomp policy to bionic""
am: c712aedb0c

Change-Id: I6e95b0579d749e898ef2933fe1fd92c81b28ad8c