tree 5f5c405f65ec0696d6b9a0afee38dba803b3a792
parent e9687e96904289af0ffae138cffc8a5318bbeca7
parent 34c79e8076080778d0bb49acff90d6cfced6d8e6
author Treehugger Robot <treehugger-gerrit@google.com> 1603901698 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603901698 +0000

Merge "Fix replacement time zone ID generation logic" am: 34c79e8076

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

Change-Id: Id55e6765cabd637e778012af793f13720dbd923f