summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2023-08-31 21:33:02 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-31 21:33:02 +0000
commit5d2b47ec39aad0d0d7c41bceb02c977fe329b160 (patch)
treecd01a3038f8470506755d6d9afee8ff5d304532f /libs/androidfw/AssetsProvider.cpp
parent7b7bac2e07b4fcc3881d6ee03c1af02295be985f (diff)
parent26447f1bff675f181e281cadcaaf99f5aa426d1c (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9f5c4a4b8f -s ours am: 26447f1bff -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24613372 Change-Id: I3a02b6696d12b88d916e5375cf78d54cbf0d3792 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