commit | c7117a2f95725f93bcabb8cd15253cb57199b902 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Sep 19 08:01:49 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 08:01:49 2020 +0000 |
tree | 0f79c9873e67759b1e4fab2af50838282684a11b | |
parent | 94024075bf502f145e3e40ae2a629e91d4058ff7 [diff] | |
parent | 8abca045ca7f2c278ca469d1b079f9a7936378aa [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 23706d874b am: 6450a46b4d -s ours am: d74ed4d49e -s ours am: 8abca045ca -s ours am skip reason: Change-Id Id4940d3a2330561076f9bfc43fec310efec90d77 with SHA-1 a4add29008 is in history Original change: https://android-review.googlesource.com/c/platform/packages/wallpapers/LivePicker/+/1429926 Change-Id: If983d76caf3583866552b5e7a63c03431f67eb42