summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2023-08-31 21:02:29 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-31 21:02:29 +0000
commit9e0f882e3f87b2bd92fdfd8afbfafead4e9b1dd4 (patch)
treef032bce46f62e9941a83650df8848ea68b8597c9 /libs/androidfw/AssetsProvider.cpp
parentd86b42339ac4d3e360c0d510cdbddbc045a0a343 (diff)
parentcdfd86e8df68feeb57b076780c8ea7e96228939a (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: cdfd86e8df -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24616461 Change-Id: If0a8395774323097578640a36ede64932950c00b 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