tree c36bdc1bb46d0a04443ad7fa1e07eb1de8f266b2
parent 3fa60b995416bf31e1a2be681b0014f45a5c998f
parent c576f7a90d3ba5de8fc90f85be7bed55afb07869
author Xin Li <delphij@google.com> 1598998206 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598998206 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 555a4df687 -s ours am: 4f0f474555 -s ours am: c576f7a90d -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: I75387c83d8fb52646a9c268e3e29b5c58c48c5d1