summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-10-10 23:22:18 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-10 23:22:18 +0000
commitd37e2bf529514256cb24e3685a68dbbb1a129cab (patch)
tree3bdc7bda11c0eacfa54e67f4ef29d077ac3a1532 /libs/androidfw/AssetsProvider.cpp
parentaa15c239c46028382d4e34daf498f753472e06c1 (diff)
parent6400326c01dd7962c72b1042efe35051950b19a3 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8c0141f3e9 -s ours am: 45afb484a2 -s ours am: 6400326c01 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20148102 Change-Id: I9b1f70a0017f608a08dcabf216f8ccd983718943 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