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