tree da8a5c9ba84a03d14d19b19a46411325e6ae68de
parent 229e2d09cef828325015d740468f58b13157a345
parent 507c3fb099fb290fde0d1a58a71d2697ced81a5f
author Paul Lawrence <paullawrence@google.com> 1486762136 +0000
committer android-build-merger <android-build-merger@google.com> 1486762136 +0000

Merge "Expand seccomp whitelist" am: c6c11723cb am: 3b9c0fadda
am: 507c3fb099

Change-Id: Idcdec4c87b2ad5f91cbe05874ea532139fe38d42