summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-07-27 23:49:14 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-27 23:49:14 +0000
commit134966d785d5b98a90090714a64768c8ec8c038d (patch)
treee259a5ca1e24b71c3c40e0413273eb1b5a0bdaea /libs/androidfw/AssetManager2.cpp
parent8f580dbd51aef8285c840a30800c9ce20b2b30a7 (diff)
parent9afc8070b18419e3a16b4efc3dcf6187ff753726 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d76407b222 -s ours am: c0d1c63403 -s ours am: 41ab5ca8f4 -s ours am: c667c53ee9 -s ours am: 9afc8070b1 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24211510 Change-Id: I906f3724892c157c03992d127111826e7b348a49 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