tree a39cc93956534fca8e4ba59b81b22653cd95fa80
parent eab4dc7f8461204b8e0b1b6a93bdfc16ff68add9
parent 55a61d2f61adeaf355f15b85fb9ceb58e65771c7
author vichang <vichang@google.com> 1604662435 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604662435 +0000

Merge "Correct annotations in ZoneInfoDb" am: 55a61d2f61

Original change: https://android-review.googlesource.com/c/platform/external/icu/+/1486181

Change-Id: Icf30ea789b91e4e0d9e2c808cf641056ab716333