commit | 9b9fbcae39e0a7bc4f5491c262c60b4c4e843d39 | [log] [tgz] |
---|---|---|
author | Jeffrey Vander Stoep <jeffv@google.com> | Tue Oct 04 21:30:27 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Oct 04 21:30:27 2016 +0000 |
tree | affd1bd3f77838fd00d890497407116100043fa2 | |
parent | cd0a1d3a43c6a7b4dabe570a46a82a3d8493cfd1 [diff] | |
parent | 0aef8ce6ab2175f3c6c30029e4f2478b66ab8720 [diff] |
Merge "mediaextractor: Skip setting memory limits on ASan builds" am: da1ce7f95c am: 41e71e5c92 am: ff39fd1e3a am: 0aef8ce6ab Change-Id: Ia924943e5c83773b718aa4bb840aa702a6038711