summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Victor Chang <vichang@google.com> 2023-08-23 04:43:24 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-23 04:43:24 +0000
commit22399c4f96c2307d45d909d1bb93d6c67301a00d (patch)
tree3ead943be63bb255947ab0ad62b773d60362a2bd /libs/androidfw/AssetsProvider.cpp
parentf8b473dd899301a4997d6192d4ed64cb0c7b8ccc (diff)
parent0b938dae1b42a87c3e0bce1e305a05e6f1d32505 (diff)
Merge "Add ResourcesLocaleTest#testDeprecatedISOLanguageCode test" into main am: 704d2fffec am: 1b53d7fc34 am: 0b938dae1b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2705153 Change-Id: I3a39d3bdc9cfdad50019ef9730685b3889b34d7c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions