| commit | 2426528e62337da337ccdc18c90b50daa125a8f0 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Apr 22 19:38:33 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 22 19:38:33 2021 +0000 |
| tree | 87611a13927dbbd03ed3a6efe9f44700c433b172 | |
| parent | 235f6a230b22fa388580ac40bc606ef9f4ddbaa6 [diff] | |
| parent | b4ffd38e63e7c33e7c2cb18526349399f6b79b14 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 7852f2af80 -s ours am: b4ffd38e63 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684927 Change-Id: I6f5383e1e74e9a3921ddbaf7663d51afc08d1862