| commit | 14db1f749efe4f87ea907c8f6ad3a42167cebc96 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 07:00:51 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 07:00:51 2020 +0000 |
| tree | 9717537cc3d2768684a81542ececb0139ae21196 | |
| parent | 1783560bf3ac96c7ccd7a3a35b78cc797dc8e681 [diff] | |
| parent | 28a18f719f2999f4e2516d32c0445b3fb3d96a1a [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: e7cef3a418 am: 32055519cf -s ours am: 28a18f719f -s ours am skip reason: Change-Id Ia90a2a34f13272e4af10028a35af4956fefbcc4a with SHA-1 57d537df67 is in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/1430080 Change-Id: If9d320753d1bf78d198624a2fbc5797e023ab564