summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-12-10 02:00:15 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-12-10 02:00:15 +0000
commit0eda1cfb2315269230eb3323f3c90adbec7d92f0 (patch)
treedead0ce43131376ccbcb371fe51526a3a1a36be5
parenta93ab4dac0e8a5f11d5bf75a5c3e4548f1ea8ad6 (diff)
parentd01f1603a77076cc2a120910fe8dfcde4c2c8326 (diff)
downloadBasic-0eda1cfb2315269230eb3323f3c90adbec7d92f0.tar.gz
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>
0 files changed, 0 insertions, 0 deletions