tree 6a2b621dca849d14c98191269e26ac8a9090f32e
parent 8651892a0d914055de6f4a4b5ecc01266c4103c3
parent c1512ce4fdbca3ee096f10fad8b93b3afa91489d
author James O'Leary <jamesoleary@google.com> 1624339539 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624339539 +0000

Merge changes from topic "consistencyjpo" into sc-dev am: c1512ce4fd

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/WallpaperPicker2/+/15048683

Change-Id: I716ebe27dd2522d73f30befd34c510793b322cf1