tree 98df4b866e577b82546819f6e1e043fa1ab84ed4
parent b09d0f9822392cc9b282e1d8806f0d2222155b59
parent c78cc9dd30bfa480b17ed90d8b91eeaa2bcf68ab
author Xin Li <delphij@google.com> 1633679830 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679830 +0000

[automerger skipped] Merge Android 12 am: 50a5d7f0b8 -s ours am: 22d8af430e -s ours am: c78cc9dd30 -s ours

am skip reason: Merged-In Iec3882076f3e16d22f5fb8c207f8a2af5de8fae1 with SHA-1 6a30710e37 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/javaparser/+/1847573

Change-Id: I9012ec27539719c1d0aa9fb103583b166d34a364