| commit | 62401be5291b21e761e03b6c7ec6ae35dc33c5c5 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 03:33:52 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:33:52 2020 +0000 |
| tree | dca1659251420b19796fb0202b66b28e819722b6 | |
| parent | 175c5e4928cdfd8fc26079022d67e61fe6ca2258 [diff] | |
| parent | b4b32660602e7726c74b70b6e12a067abc06cb39 [diff] |
[automerger skipped] Merge "Merge Android R" am: a3e1235f8a -s ours am: bb084c6596 -s ours am: b4b3266060 -s ours am skip reason: Change-Id Id4cf43716e4d6f8b997a2e88cc14441f6e0b7620 with SHA-1 52f7a5d731 is in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/1422467 Change-Id: I32c65106223414e9de969a1a7971b0f53e9d3d4b