summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2022-09-08 23:23:15 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-08 23:23:15 +0000
commitbf5dbf274722f8a765793c9507abf6a5577f8fc6 (patch)
tree6a51593c77d38d03402c42d2f0f89d31dbf0e5de /libs/androidfw/AssetsProvider.cpp
parent1ba1e56325cf1a0c83acb8fc18c54eefb4e7362b (diff)
parentc6b68a8801ed97ab4e5939b020aefb1000206a67 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d8fe0f5506 -s ours am: 97a4f98c76 -s ours am: 482046781b -s ours am: c6b68a8801 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2205997 Change-Id: I912e84b0b4ecca9876c7072638aac6f739d41e30 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