summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-07-01 01:46:54 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-07-01 01:46:54 +0000
commit3139905d00f525b378fd807940c011df67f246e3 (patch)
treea30c0c10ab6a8d90bcd699c21fe023bd6305eeea /libs/androidfw/AssetsProvider.cpp
parentb26644624bc9f79b20b1c925ff2148049e2de735 (diff)
parentb08386256e711bf08154ac9e060196c2ade19413 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 682f7972b2 -s ours am: 5ea0784272 -s ours am: b08386256e -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19131863 Change-Id: Ied92dca22a8a105493565ebec962ce1a51c0590f 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