commit | 8387377f6f25b480f169bdb97889115030f67687 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sun May 23 04:42:42 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun May 23 04:42:42 2021 +0000 |
tree | cd7c0474fe11ed68713734493a977745e0de40e0 | |
parent | 28c2dc9c87b3f6c0a783bc5be642eb0be4267aff [diff] | |
parent | 6e8805d767ea150309e5f70932a6153f5406b9e6 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 88e7373128 -s ours am: 48768fe15c -s ours am: 6e8805d767 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14688154 Change-Id: Ife63bb2421cbe512a8843b8155f5bb30cb173d38