summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-09-11 00:39:59 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-11 00:39:59 +0000
commit717d0af7c5118f34ba75af8347e6653ccd05b779 (patch)
tree5fb4bf4c5aef4a63ffbf47da46e4e12bf6ab4233
parentecde83a0b44e8fe353c43dcd9bcc84b3f3e54dae (diff)
parenta17b9c62f72ce41e5ab82b7e4dfca2c3a3b22411 (diff)
downloadHTMLViewer-717d0af7c5118f34ba75af8347e6653ccd05b779.tar.gz
[automerger skipped] Merge "Merge Android R" am: a17b9c62f7 -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: Idc4eafe4a5e9589d310baf692480b794e410da0d
0 files changed, 0 insertions, 0 deletions