tree c36bdc1bb46d0a04443ad7fa1e07eb1de8f266b2
parent f52192488892c25f75e43ac81286b3add6ade162
parent 555a4df6870fd1bf91c6d718fb85d78267ac1eb8
author Xin Li <delphij@google.com> 1598992635 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598992635 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 555a4df687 -s ours

am skip reason: Change-Id Ia304ff142efc0a4550772f5cea25ef55b781542d with SHA-1 0d256aefb8 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/timezone/+/12470403

Change-Id: Id0717f4415a65276f204d3b4e59ec8a1ef336c21