diff options
author | 2023-09-25 21:51:58 +0000 | |
---|---|---|
committer | 2023-09-25 21:51:58 +0000 | |
commit | bf8bf6ac410db94aec4d85393dfbaacbc76cd3fc (patch) | |
tree | e123e3809bc7d948d9c08c2b65a978cf20120c1d /libs/androidfw/AssetManager.cpp | |
parent | 3fd963c052fb075488c7b3a6e3e99654c48497ec (diff) | |
parent | 28805c7b4b6cbe51510b95f89e22b2290952b810 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 537b777eae -s ours am: 28805c7b4b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24836248
Change-Id: I6487aca4503518a3146644911470e3b7acf8c0f3
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