tree 8db15fe1e3a49449c117dfde2a0927d22e7a87db
parent 525244b7b754ca1581f690ca1c66ba9c9c4032dc
parent 964e0e09ef0aab4d0f4939dd25fb5e87633435df
author vichang <vichang@google.com> 1604682369 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604682369 +0000

Merge "Move getOffset(int, int, int, int, int, int) to ZoneInfo" am: 964e0e09ef

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

Change-Id: I39c47e67b27765ae880f9d3eb0eb798d49bb4869