summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2022-04-20 05:02:34 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-20 05:02:34 +0000
commite37c09235836796cef008518df44d38bae0a7f7e (patch)
treea180775f2dd15c2a4340434b089b325e59ee73f7 /libs/androidfw/AssetsProvider.cpp
parentedf7bc70947bd1ee41abaa667d9ad8ac5fedc651 (diff)
parent531503681ff1e20836aaccf65ef9d8f9f964e0b4 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: f93e051460 -s ours am: 531503681f -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17800856 Change-Id: Ia97f9cc63c9a29dbe70a6501f6c9673ad2ddd3c6 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