tree 2ff1da81e8d857a00346f093ef05610da955659b
parent d2eca211d4ff8e0971dc0025bbfc87dce1f26a41
parent 3166166bdda3a8cbdb9655eb375bd67c4bec69ce
author vichang <vichang@google.com> 1632221573 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1632221573 +0000

Merge "Replace @CorePlatformApi APIs usages in TimeZoneInfoPreferenceControllerTest" am: 3166166bdd

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1831314

Change-Id: I458bf767bbea8b5921f00afae884d309d270f7b0