tree c36bdc1bb46d0a04443ad7fa1e07eb1de8f266b2
parent 98a455908ec9982f673005b3193b8054b9ae845b
parent 4ada375b30a41b9609604c22007eeb24e22bdb2f
author Bill Yi <byi@google.com> 1600122014 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600122014 +0000

[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: 7ebe482672 -s ours am: a8df54082a -s ours am: 4ada375b30 -s ours

am skip reason: Change-Id I6d60fae145fa1836997f6f1bffa945b22e439496 with SHA-1 f901b2a776 is in history

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

Change-Id: I71f0359f4f825929a45cb25402ed5f56f415149b