summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-04-11 06:53:04 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-11 06:53:04 +0000
commitbb61650be8d057c82be1e8009b5d9042e385131b (patch)
tree223812c21059961fd66f1fb7c43a3d13b91778d3 /libs/androidfw/AssetsProvider.cpp
parentd0a05192fec226b1a01f99f83f03b27e7930bd81 (diff)
parent268453bb51384e099c132ff38cedd282dc72b6b3 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 94547db97a -s ours am: 268453bb51 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17674020 Change-Id: Iac3f203281720dff6281fa0c50b0b4805d312598 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