| commit | e1ec6c059d30e23d0cd7b74d06c088e367d54a27 | [log] [tgz] |
|---|---|---|
| author | Sarp Misoglu <sarpm@google.com> | Thu Nov 09 13:03:46 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 09 13:03:46 2023 +0000 |
| tree | 7631ce7eccb0d7191ebf16b408f20c3590bbf2cb | |
| parent | e6e29004facbcb15f245467fb171931b62083720 [diff] | |
| parent | f6020de5478373b3101cd0729c879898e74d6235 [diff] |
Merge "Fix broken test by increasing Thread#join timeout" into main am: f6020de547 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2822950 Change-Id: Icde26788188702bb9d5d1cc9d05ec1c55d0c0b3e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>