summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2023-08-31 21:29:21 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-31 21:29:21 +0000
commit85b39f2865ea90ff09f80d6129b7eca2531c7de2 (patch)
treef4a92a38a4ca0e0e6f14a77a2265d8ae9bf5439e /libs/androidfw/AssetsProvider.cpp
parent373a11f3274a7c4339401b11e35340608ea16772 (diff)
parent67c10d856b0f42af8f32d55e0b0868c9e24e07f4 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4793eb6312 -s ours am: 9d646e5d7b -s ours am: 67c10d856b -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608558 Change-Id: Icb07b72c94be879b1964ccf7e3940f3364f3918d 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