diff options
| author | 2024-03-25 10:39:27 +0000 | |
|---|---|---|
| committer | 2024-03-25 11:21:57 +0000 | |
| commit | fa78cfa1177478ccf8dface57219e2285d8feefb (patch) | |
| tree | 8c378a711e22fd68be57b3d893c43b1cfd270767 /libs/androidfw/StringPool.cpp | |
| parent | c3f3007858d7821ab8bc2333e2a67427e83423f0 (diff) | |
| parent | 8bd336db2028e9fc1bdd4776708215bf2f3839e7 (diff) | |
[conflict] Merge "Update LocaleUtils.filterByLanguage due to addLikelySubtags change" into main am: 47f6622c6f am: 8bd336db20
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3004158
Change-Id: Ibee173a4b2d6964039bf5c55febf14dab07787d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions