OSDN Git Service

Merge "Expand Seccomp whitelist" am: 82d746fb39 am: 7b10c361cd
authorPaul Lawrence <paullawrence@google.com>
Fri, 23 Jun 2017 17:54:26 +0000 (17:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Jun 2017 17:54:26 +0000 (17:54 +0000)
am: 26aa3255fd

Change-Id: Ia2345b16277617462a74f3d89c2d7c8367a77161


Trivial merge