commit | 2bcd8f7fd241f9413e00bb78b13d192a1281116a | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Aug 17 19:46:22 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 17 19:46:22 2021 +0000 |
tree | 163920c8e35f050784eb2dca9cebe0c9983c5ebb | |
parent | 450973a248e1bd769d3990e6e02cbfdcdcc5070a [diff] | |
parent | ce79529b9276a77b12fddba3d96917dcabecf8f3 [diff] |
[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 3843c34a3a -s ours am: ce79529b92 -s ours am skip reason: Merged-In I2ea4cbc8e8e3e94447960e64cc6d39b44df474ff with SHA-1 450973a248 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/timezonepicker/+/15571810 Change-Id: I35fc0f881cd68cd4f62dc4e1620587e8821023e5