commit | bf141682a9c895fb49754e5a3bb0dc714c3c47b8 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Aug 31 21:52:40 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 31 21:52:40 2023 +0000 |
tree | 1d99091cf04f60a765a10b580f520acc4fc9e785 | |
parent | 03e004a41f187f970d670130c51396d0465f316b [diff] | |
parent | 5348af458c366792350a86aa3c0abca9ff39d83e [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 6b0c325b53 -s ours am: 5348af458c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24613367 Change-Id: I83a6438289565a8e8a41c6fa0d39a249288faf35 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>