summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2022-09-04 23:45:09 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-04 23:45:09 +0000
commitd9d7eff213da429881ff473a37c56fc964dbb903 (patch)
treeddf9f09581a41c4420ae14af1b6bf272e5f00052 /libs/androidfw/AssetsProvider.cpp
parent2134217ef392a31c165018f9f94aa295e1c59ea4 (diff)
parentf6bb4eaf462667e42762f139793057a5f5064fb8 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 10d1ebad5c -s ours am: a1311376e0 -s ours am: f6bb4eaf46 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2205397 Change-Id: I3d8d9f7907061dbc8f0d754006bf4dfe5fe32e64 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