| commit | 7d87d48cb30349dc525894ebd12d2604e54cc368 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 21:27:25 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 21:27:25 2020 +0000 |
| tree | 5fb4bf4c5aef4a63ffbf47da46e4e12bf6ab4233 | |
| parent | e5e18445aa09500b771bd9ba3710592b0eadb2a8 [diff] | |
| parent | 3a8e00eef7fc85ee946e769483724ee34e4d454d [diff] |
[automerger skipped] Merge "Merge Android R" am: a17b9c62f7 -s ours am: 717d0af7c5 -s ours am: 9a83aea707 -s ours am: 0ace9bb9ac -s ours am: 3a8e00eef7 -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: I086a17c83601ea32e6aced1a0dc639d6933580d2