tree 6f4f62583372ef5b04865a5667e4bc532993f3b8
parent 82e8a69dd7d3ccd7529e2db2728a5856df79ca7e
parent 5f3fbe8702e6aec4b231b28f21e3fe640a13b5b2
author Xin Li <delphij@google.com> 1689395406 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1689395406 +0000

[automerger skipped] Empty Merge Android U (ab/10368041) am: d5963389b9 -s ours am: 5f3fbe8702 -s ours

am skip reason: Merged-In I1079096292854d1e83629141dc85b4c6c6a8b5b7 with SHA-1 dbbbe2bb18 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-harmony/+/24087539

Change-Id: I057b953c005c3a16e552d734fc07e30bbdbd1276
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>