| commit | 175c5e4928cdfd8fc26079022d67e61fe6ca2258 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Sep 01 21:47:04 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 01 21:47:04 2020 +0000 |
| tree | dca1659251420b19796fb0202b66b28e819722b6 | |
| parent | d06b2332644e8d6573967e79eabefccee3601364 [diff] | |
| parent | 2991b3ef3a165e60f4a7f5bb9fcd2b8c929b1947 [diff] |
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 52f7a5d731 -s ours am: 2991b3ef3a -s ours am skip reason: Change-Id I712ac4d42d2fddb5f4664b6b5b38ecce17718aee with SHA-1 22e7671207 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/12470310 Change-Id: I99a26660eb28578f1beea05b9cef4ff92df306ed