commit | 860163c059f31056f04d9176bd3f2cda1236087d | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Jul 31 01:01:38 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jul 31 01:01:38 2021 +0000 |
tree | 587e5a99d46d738ad3127095e8e007ec49057225 | |
parent | 04ca9295d48fc4ef1d69595a6472c3ba8432a427 [diff] | |
parent | 4c215007cf538d5e295aff6d3cbf5a9b7105e2d0 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4c215007cf -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15429138 Change-Id: I6f3a8f219f2df223c470749218d40c883d58a28f