summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-06-06 23:41:52 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-06-06 23:41:52 +0000
commit2f6d99b9aeb5a2af658c51a029a3cf1a9b2445a3 (patch)
tree9ea9a5d395eb357715aa7607cda351a0e2757c28 /libs/androidfw/AssetsProvider.cpp
parent5145a152574194418c0ea51d980d91eeb53395ab (diff)
parentcf809095bb906a1a372141c6f321cd49bf426eb0 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: dad4cddffe -s ours am: 8b96e1da03 -s ours am: cf809095bb -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18744362 Change-Id: If55c8f0428704013dc098c6be3a07881a17cc44c 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