summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2022-06-06 23:41:36 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-06-06 23:41:36 +0000
commit5145a152574194418c0ea51d980d91eeb53395ab (patch)
tree9ea9a5d395eb357715aa7607cda351a0e2757c28 /libs/androidfw/AssetsProvider.cpp
parent9f5ed9f3e75f9ded82e17024e833485a59e2a99a (diff)
parent7ccf93ff3026f9ea42a8ca960463ac475d52bcfb (diff)
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c810e5dea0 -s ours am: 9934b62ec5 -s ours am: 7ccf93ff30 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18744362 Change-Id: I22cad706888b84675143b38428fd5e6525701e64 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