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