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