| commit | 0eda1cfb2315269230eb3323f3c90adbec7d92f0 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Dec 10 02:00:15 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Dec 10 02:00:15 2022 +0000 |
| tree | dead0ce43131376ccbcb371fe51526a3a1a36be5 | |
| parent | a93ab4dac0e8a5f11d5bf75a5c3e4548f1ea8ad6 [diff] | |
| parent | d01f1603a77076cc2a120910fe8dfcde4c2c8326 [diff] |
Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master am: d01f1603a7 -s ours am skip reason: Merged-In Ic683c6804e6db9ab2edb3d2c8b524c03b8844a08 with SHA-1 360a0a6499 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/2337139 Change-Id: I0b85e7568726390ee3471273f0030fcff21bc4ab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>