| tag | 141f0c0fe7c97cc06aba8bdb659cc701cf8d4d08 | |
|---|---|---|
| tagger | The Android Open Source Project <initial-contribution@android.com> | Tue May 14 16:44:38 2024 -0700 |
| object | 2d410c3afd7a8115c3e2dff8558d081af7d9c754 |
Android 14.0.0 release 43
| commit | 2d410c3afd7a8115c3e2dff8558d081af7d9c754 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 20 20:06:39 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 20 20:06:39 2023 +0000 |
| tree | 78b4850c16da558b6ec6fde5097ddd295f9e2bb8 | |
| parent | f2fc65a77c870980c89ab6b875f40ffee5c5557e [diff] | |
| parent | 637b7fcd208304ce86cd9d75ed07754f5b58c496 [diff] |
resolve merge conflicts of c178021c320a49a2690403d3fca3c213294b27a6 to qt-dev-plus-aosp am: cee3a8836c am: b08fef7324 am: ffe59902cf am: 17b4746d43 am: bdb1501d47 am: 5b6254f657 am: 637b7fcd20 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/WallpaperPicker/+/16936496 Change-Id: I3ce76fd40ff4a406aa44cc5970c8275efb9c3a14 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>