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