tree 5fb4bf4c5aef4a63ffbf47da46e4e12bf6ab4233
parent d696342b04a89f93090b891af3042aa85866d330
parent 0ace9bb9ac0fc1dcbe9d3c641a821a290e220460
author Xin Li <delphij@google.com> 1599796736 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599796736 +0000

[automerger skipped] Merge "Merge Android R" am: a17b9c62f7 -s ours am: 717d0af7c5 -s ours am: 9a83aea707 -s ours am: 0ace9bb9ac -s ours

am skip reason: Change-Id Ia2ee8ddd83d8fdc6c583e501892b413de094ed0b with SHA-1 ecde83a0b4 is in history

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

Change-Id: I3f3f6001e8c181672f0b3ae54a17c474abeeeb5c