tree 428967ed098a7d4e7a72ee76209c9580b4b6cf3d
parent 585edbd20bb1c44491e8726e5c42dfe0900275d1
parent 115791acf43113c3429760ccca276f1666cd758b
author Xin Li <delphij@google.com> 1689402112 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1689402112 +0000

[automerger skipped] Empty Merge Android U (ab/10368041) am: a55e6c0991 -s ours am: b9fc8f70c1 -s ours am: 8b699825f0 -s ours am: 115791acf4 -s ours

am skip reason: Merged-In I8a9557218db684ac558f242e3daa2b19b7c45e15 with SHA-1 1be9601f7c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/javassist/+/24087864

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