summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2023-10-10 00:12:38 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-10 00:12:38 +0000
commitba219d62657d94cf64622765fdf7fe07c65ce376 (patch)
treec94acf261ad5d42de9af2aa8bfd37b0218cf80a3 /libs/androidfw/AssetManager.cpp
parentf9c1461a72262cb89379e201715cefab7801644d (diff)
parent4d0fb6f616b1b229f779c5dbc652e43b19e5d6d6 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a3a7d9b3d0 -s ours am: 4d0fb6f616 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24976964 Change-Id: Id509c9e4f3da64dca7817e80a546f4de0513d046 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions