summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-10-10 23:04:28 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-10 23:04:28 +0000
commitaa5b7a224510732502fb953ec212a513a435b14e (patch)
treed8f67aefcd51fcbf9addd80f7f6a3b2380afa434 /libs/androidfw/AssetsProvider.cpp
parent1d85a6cfcb3e42dc4edb247986f453f4e2079455 (diff)
parent0994ecda718ae73c1dd1d544ddde36ff863bf07f (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7b92bdbaa3 -s ours am: 0994ecda71 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20144916 Change-Id: I65477fce7c32a2662849bda5c7a85ec0195164ba 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