summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2023-07-27 23:49:00 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-27 23:49:00 +0000
commit8f580dbd51aef8285c840a30800c9ce20b2b30a7 (patch)
treee259a5ca1e24b71c3c40e0413273eb1b5a0bdaea /libs/androidfw/AssetManager2.cpp
parent8c3b71d72903106c929b63ae7ad0fae0665e4b18 (diff)
parent863d21ea13a15b8315f5a0ad797518e95e144eec (diff)
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 36a868be35 -s ours am: e36f929790 -s ours am: e19c297f46 -s ours am: 34801896b6 -s ours am: 863d21ea13 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24211510 Change-Id: Ib6d91076ff5bbe0b4a8da8699fa29e45b41873db 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