commit | 828f3d75336b07bb1d1b78e701878817fb9aefbc | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Aug 31 22:41:53 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 31 22:41:53 2023 +0000 |
tree | 8277edbad4e6fab45b95e7a96dcafa62c78545c5 | |
parent | 6188c678895ee21e6ccc69b7aff678010a4dfa74 [diff] | |
parent | 2d259f969dcb33f3a7027c9eb8ab65097d6aef9d [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 1f36a1fafd -s ours am: 85278490ae -s ours am: 2d259f969d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24613368 Change-Id: If3d61fefc65421e284c7c586804c9aa765c4ca59 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>