tree 05f06784c72986ac063ff92c93c3c821f5a81b95
parent 3fa671bab460320dc3fc13ac1759a10dab607b6d
parent e6bf1a83d82952a8e035e6e641858e3d4746d0c2
author vichang <vichang@google.com> 1632222383 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1632222383 +0000

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

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

Change-Id: If94d8a65c9902180466481f157224a5389d9b117