tree be38f965a9d1833a2a91afe485505e300a2f55cb
parent e2c9f08e7b7f0ea8963f378d70e3b7785d786244
parent 85998cd83a1745642bc6823f7864ff47a2f2aa53
author Evgenii Stepanov <eugenis@google.com> 1535138879 -0700
committer android-build-merger <android-build-merger@google.com> 1535138879 -0700

Merge "Skip memory limits under HWASan, same as ASan." am: 4eeaffe5ee
am: 85998cd83a

Change-Id: Ic94e69066e9c34ab4e0ffeb0f8948cce9283af86