summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-07-01 01:46:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-07-01 01:46:50 +0000
commite88d7f9d361cb971c72100072decdd1d5aefc924 (patch)
treea30c0c10ab6a8d90bcd699c21fe023bd6305eeea /libs/androidfw/AssetsProvider.cpp
parent2d8cf344cdaf90c87de3e71f0658e182329ecd9d (diff)
parentec6c25340bd7dfc2c39d3c98ebdc964a661be976 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 83d3e91913 -s ours am: 60626158c4 -s ours am: ec6c25340b -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19125626 Change-Id: I4c34095266bf9c7b26573e48231dd2c5bc53d69c 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