summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-04-20 05:41:00 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-20 05:41:00 +0000
commit6045db555a4ac4479b9c65c8ef0dfdeac6cd7971 (patch)
treedebef3f574bce8fdedc39bb2a158c4a42e14016a /libs/androidfw/AssetsProvider.cpp
parent42992017552c27ea2ce644adccf5b16258f1865e (diff)
parent0d3c156f41b5d70878847e2e66bc8d9e128da487 (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: 0d3c156f41 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17795866 Change-Id: Ic88c15368a7164ce0b0dc6652ce0b65b70b14c20 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