summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2023-10-03 03:51:22 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-03 03:51:22 +0000
commit2a8db4ea7d8c3e3cadd3e9648338938a593bed1f (patch)
treea13dac380069acaf4d6dd7f5c56e7b31c485fcb7 /libs/androidfw/AssetManager2.cpp
parent2b737ff795d26c2c06a887be255f716cfaf9faa4 (diff)
parentbde2b96434b618c9a662fecadb85b2304ce53971 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bde2b96434 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24917610 Change-Id: I826a02741d599890caf751748c802c63eff91d88 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager2.cpp')
0 files changed, 0 insertions, 0 deletions