tree cbb77f584c0d727913085324ee0e7a66f32b9b2b
parent 903eaef12c3a7494c1e0071332746cfc61ec26e8
parent 2d757f6fddad7e3ece905480e422c260199e9c52
author Xin Li <delphij@google.com> 1620438534 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620438534 +0000

[automerger skipped] DO NOT MERGE -  Mark RQ2A.210105.001 as merged. am: 2d757f6fdd -s ours

am skip reason: Merged-In Ie0334fddf5ad08b1c90e2d5c41ac48f325e1ab7e with SHA-1 d66162ac0a is already in history

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

Change-Id: I9f058a1bfb64ad022da648f7cb104c297c341cc7