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