summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2023-09-28 04:02:54 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-28 04:02:54 +0000
commitad5a0f331d32732f2eb62b6fc569a4b08666813e (patch)
treee92493f9267fd38bc78910009a0df1732aa5a71c /libs/androidfw/AssetsProvider.cpp
parentbbb4244cc04d896b75ac6e81154ec1bf7610ba50 (diff)
parentdac593708b9dd45808ad2b72bf5b02d11589374d (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: e3fa5843d5 -s ours am: dac593708b -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24878908 Change-Id: I5b43c2e235446a579861d5929be430098a7c127c 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