| commit | 79c3bdb140efc778185de38e876d9637b6b129b9 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Wed Sep 18 19:33:34 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Sep 18 19:33:34 2019 -0700 |
| tree | 4c7489cc18a3e9606e050d2318d01543bc8d2aa9 | |
| parent | 1c87932d45c41671166e7d8d52485a25ab5ed158 [diff] | |
| parent | 84db036a7fa7b14b0a143b55d3b725e388fb62ff [diff] |
Merge "Lengthen ScopedDisableMallocTimeout timeout to 10 seconds" am: 08c4133c91 am: cbafba10f4 am: 48f88f67fc Change-Id: I1cd3b22876788e89c7543c7a751f4ed73ecbd8ad