tree a99bb8c3da8d21884178c058ffd80ddbb053de2b
parent 85d7548f8118a690e085bc0cb79b72217aa1561c
parent bc17540276532c0a698e6f21bc489321a36df8f5
author Xin Li <delphij@google.com> 1646827804 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646827804 +0000

[automerger skipped] Merge "Merge Android 12L" am: 662cb70889 -s ours am: 5796ab0c56 -s ours am: fa7ec53ecc -s ours am: 40ee5730f9 -s ours am: bc17540276 -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: I94a21781e56aa74cdaf433b9f6030667bcc9f4ed