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