summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2022-09-09 00:11:15 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-09 00:11:15 +0000
commit98db29720d8d09c57b800fa170d8ac2a566c1fe6 (patch)
treea2e1ba484292c8ad28551f8142ef882382a3fb4a /libs/androidfw/AssetsProvider.cpp
parent2b891f523a7d7d92ed9ead8ebd326729eb651cd1 (diff)
parentb73e9e35e5e4316c49ca06abdf8d03e076b0e14c (diff)
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81ddb23c17 -s ours am: 46f25062cb -s ours am: f6874e7fd1 -s ours am: 2a430c9784 -s ours am: b73e9e35e5 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2205998 Change-Id: I23d4fe72f097482d7f1e5476ac4bff808f0844be 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