summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-05-24 01:23:31 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-05-24 01:23:31 +0000
commitc017a42a5e6ab5b1c8b942a2a7174bc4b3e566d1 (patch)
treed1b963dc2aba5fc3af6e52444c78ea2bf78ec95c /libs/androidfw/AssetsProvider.cpp
parent22bb693f880ed0a556dd73d10670aadacfadaacf (diff)
parent480ba9ece7e9a2a22d3c6f5bf54270ae5edf297a (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 606074be18 -s ours am: 480ba9ece7 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18517084 Change-Id: I8f3e7141ba067c46ceed90c56d3362fb4e87111c 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