commit | b58fe43ff9717a70870542627ff3008326af945a | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sun Aug 29 20:39:44 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Aug 29 20:39:44 2021 +0000 |
tree | 2cfcc7682e8ead397f2668c47cf27bcb081bebf0 | |
parent | 501c3dec9b73a157686faf35bec90b3ec1e57c3b [diff] | |
parent | 03217a9ec036199362ada9666b846f93b8932efb [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ef98241891 -s ours am: 03217a9ec0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15695783 Change-Id: Ieebaedb77eb7ef845b60e7bf9a0e64fa1bdeedcc