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