commit | cddb6f451f5e4cce13f0febdc7e7b18842ebc8a7 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Aug 31 23:48:21 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 31 23:48:21 2023 +0000 |
tree | de61f308763f6915abf6d0f5039539c29d339409 | |
parent | 39be64950facfe43ebf310d0e669586affdba44c [diff] | |
parent | 21dd999bac005c74039ea234a4b7fd0deec42784 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 68a604222e -s ours am: 1de4841dd8 -s ours am: 73c53e9125 -s ours am: 21dd999bac -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24616459 Change-Id: Ie70f40d854f7dcc3cec0992afd370a75756a4b51 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>