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