tree 428967ed098a7d4e7a72ee76209c9580b4b6cf3d
parent 754227d3b47650e00db5fc60d57ca6209ed12e6a
parent 8b699825f0e4dad89484035c7963e12af68d47f9
author Xin Li <delphij@google.com> 1689398000 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1689398000 +0000

[automerger skipped] Empty Merge Android U (ab/10368041) am: a55e6c0991 -s ours am: b9fc8f70c1 -s ours am: 8b699825f0 -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: I4baabadd7a25ab92d539d3a3ac70cc07cf821d72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>