tree 33c882a94741b5b3a291718535ef849c8153a361
parent f01337eb9111e025c8eb0deb61477c1106d7b167
parent 4be6b863351e54014d664121ff98773df3d8bc72
author Treehugger Robot <treehugger-gerrit@google.com> 1603902364 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603902364 +0000

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

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

Change-Id: Ibaba28e9e3a05c822eecc76bff507c780beffab0