summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2022-12-05 19:29:19 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-12-05 19:29:19 +0000
commit701f2d0bb03270ad6929ec834b14fdbfae5d3bf4 (patch)
tree1bcc9919ba8037004bef91a89295c4f08fec8282 /libs/androidfw/AssetsProvider.cpp
parent6460f155f310cc3b74644938712d9dbf12ca7793 (diff)
parent98e05c0cb8a17116a7e4abe40d511bd9932b3e9f (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 98e05c0cb8 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20630531 Change-Id: I05925e5f6e683ce7ee357ee2c71a8d9b2a656b8e 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