tree e16f564dd2822bef8b1cb7a1b6412d9a16b87765
parent d1691e49aa87948049e9dff26254260f196bb803
parent ed1da62ec83bcfb9356a44205aa6ccb443f94d3c
author Evgenii Stepanov <eugenis@google.com> 1502930834 +0000
committer android-build-merger <android-build-merger@google.com> 1502930834 +0000

Merge "[cfi] Adjust RLIMIT_AS by CFI shadow size." am: 3e834d18e8 am: 70b1b40071
am: ed1da62ec8

Change-Id: I05c75903df13393149cd0c09511a8f4d6bf1fd0e