commit | 86f41edcb3a247c7b02b3073401aec2e38e2d376 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Apr 21 08:26:21 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 21 08:26:21 2021 +0000 |
tree | eac7f51daf21c054ac94ba0a9c335a369063c922 | |
parent | 65aed0d0a400f643ddb79b93f97251eee510c1cf [diff] | |
parent | 37ed9af2bf5e1919ad46dddc0da5e1631c75f1f6 [diff] |
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8a5869561 -s ours am: 37ed9af2bf -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14260509 Change-Id: I9b8599f444ec50f173ea35d8604aa0829453e89f