| commit | 56c03c2454e93899558aee8c0a78ed3c2337e301 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Mar 09 12:10:17 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 09 12:10:17 2022 +0000 |
| tree | 1664b2924e4da9b8c639ec84eab20bc68569e38e | |
| parent | 9dd284bb885dcbc8b2c580c7d95d09f9842fb29c [diff] | |
| parent | f106d0914fa7f42d30f4497bbfcf822e92ab2c48 [diff] |
[automerger skipped] Merge "Merge Android 12L" am: 86bd012136 -s ours am: 0bb3cdf3a4 -s ours am: 22122a014f -s ours am: d5e17df875 -s ours am: f106d0914f -s ours am skip reason: Merged-In I054cb000504aecf6a363f1ba8dab130f931689e0 with SHA-1 1c5066228c is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/timezonepicker/+/2013166 Change-Id: I5117a28f442806d49ea3e23f8c3ad6fc0fbea441