summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2023-10-03 03:51:01 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-03 03:51:01 +0000
commit45dee31b06ecccece14c92f6edd4ab083f4f2be7 (patch)
treea13dac380069acaf4d6dd7f5c56e7b31c485fcb7 /libs/androidfw/AssetManager2.cpp
parent00285e91a4840d6aedb00d29675ea6aa415b4531 (diff)
parent2d8efd5e602eb243ea9af5be7b125c503e161abc (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2d8efd5e60 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24917179 Change-Id: I2d07c346a390e61336581c2d50a6e84886ec3c3f 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