commit | 1783560bf3ac96c7ccd7a3a35b78cc797dc8e681 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Sep 14 21:50:49 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 14 21:50:49 2020 +0000 |
tree | 9717537cc3d2768684a81542ececb0139ae21196 | |
parent | 648544fe92ec74818f8c1e601fd2184abace5bce [diff] | |
parent | 57d537df675d5965e4dd619358a41dad631cb2de [diff] |
[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: 33ce5ab56c -s ours am: 57d537df67 -s ours am skip reason: Change-Id Id8c597d5d892b67646744fbcad651a7f9df13159 with SHA-1 94814967dd is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/12578963 Change-Id: Iab8b73d240f07947e8d81b2697cb91ae1afa8beb