commit | ce4762baa8f104f3a5477403ede762fc613ade54 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Aug 31 21:55:22 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 31 21:55:22 2023 +0000 |
tree | 1d99091cf04f60a765a10b580f520acc4fc9e785 | |
parent | 4c92e47b62a93a1753e6827ab02a984117eabaab [diff] | |
parent | ffaa0f7278deb5fdbeb44addfe0efa856b9bb955 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 3c81ed02b3 -s ours am: ffaa0f7278 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24616711 Change-Id: Id7ad35238bf6293f764189db12cb1cd6879f02e8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>