| commit | 84db036a7fa7b14b0a143b55d3b725e388fb62ff | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Wed Sep 18 19:28:01 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Sep 18 19:28:01 2019 -0700 |
| tree | 4c7489cc18a3e9606e050d2318d01543bc8d2aa9 | |
| parent | 836474420ba2d1b247c9c68b1b55a712336ae625 [diff] | |
| parent | 24baa28a7c8d9de0d23421f13cc9bd24df72bb94 [diff] |
Merge "Lengthen ScopedDisableMallocTimeout timeout to 10 seconds" am: 08c4133c91 am: cbafba10f4 Change-Id: Ife0085b1d80f299489cff2107c295c805cd32ae9