summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-07-28 05:20:45 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-28 05:20:45 +0000
commit86f144140ebaa3f6b98d89e2499e46e1b5605485 (patch)
tree882260761e1670036bf3c99fc112b22819815d4f /libs/androidfw/AssetsProvider.cpp
parent54c3b9966a637a712ce98579abd4b90c5bdf563f (diff)
parente0c2a14028f321b25424cfbcd5a74cb49424c9c4 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: a58ccd5f93 -s ours am: f5cc31d4b2 -s ours am: e0c2a14028 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24211505 Change-Id: Idfa11b4901473885eb4c02b37377414f8b5ea4ec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions