commit | 1fb1b76c32daff8cda27c661867402add28af6ff | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Aug 31 23:49:55 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 31 23:49:55 2023 +0000 |
tree | de61f308763f6915abf6d0f5039539c29d339409 | |
parent | 5dc9d77ced0e28cbeab24056865ce2b21a9cfc57 [diff] | |
parent | 1e15e838f061f182ac5fea75a8262792eff95862 [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: 1e15e838f0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24616711 Change-Id: I2aafbcf2bf746a92afcc4cc3d77863b46817bb27 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>