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