tree 766ef423e8f021e0722776b1d031d9dd4529653f
parent 8e24c2413ba2f8f1abd7ca0fb4a3bbdadd039f3a
parent 4b95116a8963880642e243c46cd0150b39872ab4
author Xin Li <delphij@google.com> 1633655989 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633655989 +0000

[automerger skipped] Merge "Merge Android 12" am: 4b95116a89 -s ours

am skip reason: Merged-In I91645ac90b6665bcbd9b2169eda92a067e83add3 with SHA-1 8e24c2413b is already in history

Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1847349

Change-Id: Id1100e9efda8040d70cf7b4a88ed050ae8b36cdd