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