| commit | d5e17df875334f08c3eaf73f9ae00ba038f19ffa | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Mar 09 10:06:15 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 09 10:06:15 2022 +0000 |
| tree | 1664b2924e4da9b8c639ec84eab20bc68569e38e | |
| parent | 387266e039eea5d647d6b48e7d42fed2b5d67d2b [diff] | |
| parent | 22122a014f3d2e5c5d094c832c9d3e1af26a8ac5 [diff] |
[automerger skipped] Merge "Merge Android 12L" am: 86bd012136 -s ours am: 0bb3cdf3a4 -s ours am: 22122a014f -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: I0b3f876dc5d5c8daaed2d0c31053e29eb5192f4b