diff options
| author | 2023-11-09 13:06:23 +0000 | |
|---|---|---|
| committer | 2023-11-09 13:06:23 +0000 | |
| commit | afe15ab917ec10d97183d1abbfad9f2f5b49261a (patch) | |
| tree | 2518f9b27d224baea0b28d0d5a0d73e1f42857fe /libs/androidfw/FileStream.cpp | |
| parent | 43404b71bf99b7e0fc11aa1050a3e9c0ee82b9e4 (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: I8566e1d97b5b1985cfebfb6c9e77ba44cb40a469
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions