tree 9915dff73102b8aecc32affc77df5b1c81551434
parent 01313d12677abde66508b88b7f4978de51725a01
parent ee666baeaca167f22faf05c224dc2304db3f6f8f
author Calvin Pan <calvinpan@google.com> 1661335933 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1661335933 +0000

Merge "Using different strings for language/region picker" into tm-qpr-dev am: ee666baeac

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19706830

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