commit | 88c140643ed2020591f0a79fc7ae195a3cb74328 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sun Aug 29 20:39:05 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Aug 29 20:39:05 2021 +0000 |
tree | 2cfcc7682e8ead397f2668c47cf27bcb081bebf0 | |
parent | b14caa52cc63db24aa38d6f72baa341ca15f4a70 [diff] | |
parent | 8f615c9467aebf3ab4ee5ea27a772514befde6da [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 604ebcba4b -s ours am: 8f615c9467 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15692156 Change-Id: I6f8b03b97f7c59ea6819a6f9f556ab211070f89e