tag | 27bd2eb810bdbaefaa06166f32624af69da8640a | |
---|---|---|
tagger | The Android Open Source Project <initial-contribution@android.com> | Mon Apr 29 10:37:53 2024 -0700 |
object | af354811f40c1630d24412045b01858158e4037e |
aml_tz4_332714070 (11568890,com.google.android.go.tzdata4,com.google.android.tzdata4)
commit | af354811f40c1630d24412045b01858158e4037e | [log] [tgz] |
---|---|---|
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 28 20:59:58 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 28 20:59:58 2022 +0000 |
tree | 78b4850c16da558b6ec6fde5097ddd295f9e2bb8 | |
parent | 6750b2f704fb070d1f69ad013c04d4014976d593 [diff] | |
parent | 5b6254f657aa278f874b819f8de2edeb59acf85c [diff] |
resolve merge conflicts of c178021c320a49a2690403d3fca3c213294b27a6 to qt-dev-plus-aosp am: cee3a8836c am: b08fef7324 am: ffe59902cf am: 17b4746d43 am: bdb1501d47 am: 5b6254f657 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/WallpaperPicker/+/16936496 Change-Id: I077bd2e243063d2faea55663445f988c5cac885e