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