summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-27 22:42:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-27 22:42:20 +0000
commit42d93619e064abd7e2d7625fb2cf68c2a5748468 (patch)
treef5aee823e291074a92ab399e2429a4587ccc9e14
parenta181a4148921302874074859236ab2821141e87d (diff)
parentea7ac3b947bcce8aaecea02dad4223f0ed98b3cd (diff)
downloadbase-42d93619e064abd7e2d7625fb2cf68c2a5748468.tar.gz
Merge "[automerger skipped] Merge "Revert "Use language tags to store Configuration's locale list."" into android10-tests-dev am: 73d16b7f4d -s ours" into android11-tests-dev am: ea7ac3b947 -s ours
am skip reason: Merged-In I53946ed4e31de0ffe9c84875c391a7dec6f5375a with SHA-1 bd0ce4d42f is already in history. Merged-In was found from reverted change. Reverted change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1127164 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1199198 Change-Id: I88e07ac97d6d5d3749182918c2a5a341b9cca6c8
0 files changed, 0 insertions, 0 deletions