| commit | ff39fd1e3aca6d4ebafa887b22cb34d60fff4abc | [log] [tgz] |
|---|---|---|
| author | Jeffrey Vander Stoep <jeffv@google.com> | Mon Oct 03 22:00:37 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Oct 03 22:00:37 2016 +0000 |
| tree | 0d710bb7b997db0d17b5fdd4df4383b13b204ab4 | |
| parent | c7a047a59e4165341fc4496e57892b7408485f84 [diff] | |
| parent | 41e71e5c92139778c294f6df3a970d2e1e599055 [diff] |
Merge "mediaextractor: Skip setting memory limits on ASan builds" am: da1ce7f95c am: 41e71e5c92 Change-Id: I6a5c264468553d3588b6ed03e01716c503208953