summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-08-13 05:14:21 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-13 05:14:21 +0000
commit7b1074574870e486ff8cf285f1d6bbf5de1fa78a (patch)
treea4aa6196f0be85943b65fa80a38e633d459bc917 /libs/androidfw/AssetsProvider.cpp
parent1fb204c19b19b850a3884393827e0202a9781cd1 (diff)
parentb8d96cdbc416a514ebee6c8bf19be8f6991c1f44 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: cc9f928062 -s ours am: 4415aeb96b -s ours am: 6356a97043 -s ours am: b8d96cdbc4 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19604235 Change-Id: I2237b591d462d51e3f6d5cd2e01d7d1d6a5780da 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