tree f84a56eefed9a8534592ed4435d96b51bc67c63f
parent ca7ad15de3dd06213430b0505d1a658a66b906d0
parent f73c0d4235c8842149daaf5b279d97694fe6891a
author Xin Li <delphij@google.com> 1660719000 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1660719000 +0000

[automerger skipped] DO NOT MERGE - Merge Android 13 am: 2fb7baf7ff -s ours am: 5b716fffed -s ours am: 30d8460a24 -s ours am: f73c0d4235 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/modules/GeoTZ/+/2186862

Change-Id: I59263293fb567b8cc9ceac32888ff6aa3722c06d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>