summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2023-08-31 20:24:04 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-31 20:24:04 +0000
commit3f9b084d57cc4868ca3b1ecc3abc864d715d9188 (patch)
tree38fb004f18e6df5d2d1bd2fd41200f0eb0728124 /libs/androidfw/AssetsProvider.cpp
parentf3cf1239b13f5f0d1a02eb741011fc85ee6bf29e (diff)
parenta588f16555461e750393b8471e54ba8754534d94 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a588f16555 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608199 Change-Id: If49b502317119a2b92789ebef3676a704fb25457 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