summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2022-04-20 05:21:36 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-20 05:21:36 +0000
commit921c91d8c957808932bae1b5c650c7775e766e99 (patch)
tree5882bcb4a8deac3ede6c84e1ebeeeba88a149764 /libs/androidfw/AssetsProvider.cpp
parent98021c2dfc79da9073830139f0633dadccb0e922 (diff)
parente37c09235836796cef008518df44d38bae0a7f7e (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: f93e051460 -s ours am: 531503681f -s ours am: e37c092358 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17800856 Change-Id: Ia01844814751e94c82e8717e5f268f71d8d6288d 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