summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-04-20 05:21:11 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-20 05:21:11 +0000
commit064c0fa5ce0fa9c1f872d89f80f5909fbc5359e9 (patch)
tree5882bcb4a8deac3ede6c84e1ebeeeba88a149764 /libs/androidfw/AssetsProvider.cpp
parentabbce0ae265cb570ed80e46d64178f5a2b88c6e0 (diff)
parent61600277ccee7a0e71950712a7571e948c5aaff9 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: eb26f2e938 -s ours am: 1a1838915e -s ours am: 61600277cc -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17796127 Change-Id: If23011bb428b485fd2b7b56eb7a66215c3981b18 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