summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-06-30 22:39:43 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-06-30 22:39:43 +0000
commit6f81eb9a4b0df7c41d5732995497df95e86da388 (patch)
tree192cb1222d821c318d84b469dd2baa97b58a3d7c /libs/androidfw/AssetsProvider.cpp
parent7d2407362c27c0f5b7547294e9490a9c75bc1595 (diff)
parent04bac8efa3f38e455c6dc2646d0090f137124ff2 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8995cf352b -s ours am: 04bac8efa3 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19125628 Change-Id: Ib99989ce15e6ddede2db377511779fabe38abeab 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