tree a99bb8c3da8d21884178c058ffd80ddbb053de2b
parent 9fbab19b83c90f34ee44cdabe3fc1cb02375a184
parent beeb7f334eec72549496d7490717ff6d4a5cf1cb
author Xin Li <delphij@google.com> 1646825814 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646825814 +0000

[automerger skipped] Merge Android 12L am: 0d2c20b553 -s ours am: 2cfda3f768 -s ours am: b3f25632c6 -s ours am: beeb7f334e -s ours

am skip reason: Merged-In Icf2fc4009ea09a16967d96bf163ed295c1da94c3 with SHA-1 1d9343452b is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/2013116

Change-Id: I851ce3d7b5aca84cc0d3a4eb0c87dc96cf480ef4