summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2022-09-09 00:11:52 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-09 00:11:52 +0000
commitd9eb258f09a82c3aebb77d8f1b2d54c9def02a07 (patch)
treea2e1ba484292c8ad28551f8142ef882382a3fb4a /libs/androidfw/AssetsProvider.cpp
parent98db29720d8d09c57b800fa170d8ac2a566c1fe6 (diff)
parent2bf349050807722f89925cc524c515e48e59b204 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: daeec7184f -s ours am: ecfd521ad0 -s ours am: 3c29a564f0 -s ours am: f7d491d4cc -s ours am: 2bf3490508 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2205998 Change-Id: I95ec1ab0cc92234c4a8b237a6ed02c61123a87f2 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