commit | 555b4cb53713527be9f1ca085a56870df28150b2 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Sep 08 01:31:01 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 08 01:31:01 2023 +0000 |
tree | 7147ee959708706e12ff1e2470e08a373336c29c | |
parent | 1eed2b3eda25c0ec9348450f7e8dbf21c8dad3e0 [diff] | |
parent | 10c3ca8d702f85c2a6d10f1b080c2eb8aff3c63d [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 805b597d1d -s ours am: bde2b2c037 -s ours am: fc0b020c8a -s ours am: 10c3ca8d70 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24695647 Change-Id: I64f4405f60a5b5262fe22f3ef3ec559d75cc3a55 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>