summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-06-30 22:38:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-06-30 22:38:13 +0000
commit1abe12dd0d5b457585c47ad66b6841084713a457 (patch)
tree192cb1222d821c318d84b469dd2baa97b58a3d7c /libs/androidfw/AssetsProvider.cpp
parent827fc011436407096e5939754c8a45118b47429e (diff)
parent668b79497269d0d47afc07b6ffb1fb9295c75f1e (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 05b6bd512f -s ours am: 668b794972 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19134128 Change-Id: Id257ead6d88af9bf9e400ff328b6ebbc9bf98c3a 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