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