summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-04-20 05:21:24 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-20 05:21:24 +0000
commit0d3c156f41b5d70878847e2e66bc8d9e128da487 (patch)
tree5882bcb4a8deac3ede6c84e1ebeeeba88a149764 /libs/androidfw/AssetsProvider.cpp
parentbc8d21b165a5c2fd4837e52bbe0340bfd8134136 (diff)
parent3beee4043072fe6c8442a943cb257e32eaec1583 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 89c279bf62 -s ours am: 7c914f88a7 -s ours am: 3beee40430 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17795866 Change-Id: Ic2e9148b86953e55ab15975ffe919967b30575c9 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