tree 5fb4bf4c5aef4a63ffbf47da46e4e12bf6ab4233
parent 7b9ef3d286142b880e95567ab3098b03007b1b68
parent 42d26f5a89d8b196e40221d167b888a37601832f
author Xin Li <delphij@google.com> 1598998192 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598998192 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: ecde83a0b4 -s ours am: 5d367f2880 -s ours am: 42d26f5a89 -s ours

am skip reason: Change-Id I46de99eddcff6f2866919a6d807236b6bd80416c with SHA-1 d53a288bbf is in history

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

Change-Id: I918c764e9f601d0cd8ccb27805f760dbf9ce3c6f