commit | 8c1f78c0c90335e0c4c5c291205b3f5b924e3ca5 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sun May 23 04:28:28 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun May 23 04:28:28 2021 +0000 |
tree | c783d34fb8cc580ca67e3251dc4971a75b8e4b2e | |
parent | ed5413f40c968df4766436800b2db15c8ce675d0 [diff] | |
parent | 366da30d2f584ef253239fde4303c4fc2228f549 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 88e7373128 -s ours am: 366da30d2f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14688154 Change-Id: I641143fa1c4bad364f92c2712ebfae306656383a