tree 9d896c2e475840c036965d3978f05e6d234e2126
parent b32f0f05ea12c9c33124986c8f76334251cd71fb
parent 7cca142b28804b82dd514a3b676a9e398d080ad2
author Xin Li <delphij@google.com> 1633665108 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633665108 +0000

[automerger skipped] Merge "Merge Android 12" am: b55a854bf7 -s ours am: fb52be8f44 -s ours am: 7329bd2584 -s ours am: ff27198ca0 -s ours am: 7cca142b28 -s ours

am skip reason: Merged-In I8c0d0378a558abbee73d5089a7db642af7200667 with SHA-1 7a841eb154 is already in history

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

Change-Id: Ib19912e631f7a7c3f17a1eb40184779f0d450565