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