tree ceffc41e5bbc05b04c0e27d40fc8042e767ad42f
parent c88e154ec556f0467f11484b493918ce5725227a
parent f6e024b7151e2cf3f579b3b97cdd68bfffe27020
author Evgenii Stepanov <eugenis@google.com> 1502936995 +0000
committer android-build-merger <android-build-merger@google.com> 1502936995 +0000

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

Change-Id: I146d602dd82b0f285a68a282214d4917f2b95177