| commit | bdb1501d4726641c2045af8bf0438dd9accc87a7 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 27 04:27:54 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 27 04:27:54 2021 +0000 |
| tree | b68dc71ff57765374166a160f814a15ada668ee2 | |
| parent | 8284057853c4acbc25267e74c726177b101e1273 [diff] | |
| parent | 17b4746d43a240fb01d07870916d80155ca5c2ab [diff] |
resolve merge conflicts of c178021c320a49a2690403d3fca3c213294b27a6 to qt-dev-plus-aosp am: cee3a8836c am: b08fef7324 am: ffe59902cf am: 17b4746d43 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/WallpaperPicker/+/6938325 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I180127c438b7bf194377c0872f52047ea5b3110e