| commit | 679472b2e9d1775ae03c2ac704bdbc687194ad26 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 08:59:43 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 08:59:43 2021 +0000 |
| tree | 5fcb5909a9652effbbd0bf6eba57f847673f3d5d | |
| parent | 63e0ec446724e372c14f7d55fc7f8d4f2b96a9c3 [diff] | |
| parent | af1149680f9eab6d54dd06f81c66ce62ff265b80 [diff] |
[automerger skipped] Merge "Merge Android 12" am: ec4ac92fde -s ours am: df3498585b -s ours am: 3251fb7855 -s ours am: 2913815428 -s ours am: af1149680f -s ours am skip reason: Merged-In I5fcea49e0ecab3433a0e369a44d42569ac5d40ae with SHA-1 5fdafc0259 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/1847476 Change-Id: I0fcfdd83eb4439536c6a6d7024a77e6ca0ead463