summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2023-09-08 17:45:47 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-08 17:45:47 +0000
commit3be7339b705776ba0c31502a42fa9bf2222c3d08 (patch)
tree533082182d40278ced4dc6da5fd1d4916af1aef9 /libs/androidfw/AssetManager.cpp
parent8a71647259391ab3ff2095370861a645771fab4a (diff)
parent6e940baeb305d4bc6501c88ce044f5491aedb717 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1add47e169 -s ours am: 6e940baeb3 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24687817 Change-Id: Idfadec22ff21049279e9dc74697f82cddc215648 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