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