tree 417c109421d175b383de5f04ace5ac1d19413250
parent 7542d1938997c6fa37ac6398374caf43d4100914
parent 179c81f7330f0ed3d562fb13295926476447b2ae
author Daniel Colascione <dancol@google.com> 1516782200 +0000
committer android-build-merger <android-build-merger@google.com> 1516782200 +0000

Merge "Add MCL_ONFAULT to mlockall" am: ccb9960beb
am: 179c81f733

Change-Id: Iae5a52528102bd3c19c3cc9eff661130d1e35c92