summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2022-09-08 23:24:03 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-08 23:24:03 +0000
commit2bf349050807722f89925cc524c515e48e59b204 (patch)
tree6a51593c77d38d03402c42d2f0f89d31dbf0e5de /libs/androidfw/AssetsProvider.cpp
parentb73e9e35e5e4316c49ca06abdf8d03e076b0e14c (diff)
parentf7d491d4cc4a041ee9891eada560b7ebb5975f16 (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 skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2205998 Change-Id: Ia9f66879a6fdd8d413db77c25075d17024a7dd3a 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