summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2023-09-08 17:45:56 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-08 17:45:56 +0000
commitf9bba98cb2f49e00c261d101e58ef6af8ed86be7 (patch)
tree533082182d40278ced4dc6da5fd1d4916af1aef9 /libs/androidfw/AssetManager.cpp
parentaf970025a1b0b4d9a145a5f4fd23e9020fdc0532 (diff)
parente3bc6be32e2c97f0cc179e366141fcd40351bc71 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 685b676892 -s ours am: e3bc6be32e -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24688110 Change-Id: I3260bada4dd925cd3da822948e9d54b1ee5408b5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions