| commit | 649af0e7f7b157de7483be85de79639244542a04 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Jan 02 04:29:52 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jan 02 04:29:52 2021 +0000 |
| tree | 3d32c0aca4119a3e2f53495d93af28de453ed26e | |
| parent | 949bb4f53c297ad6f6483488b6a88279ea99f315 [diff] | |
| parent | 069590adbb5762df825e200b6a1bdd9e53ba5a8b [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2c556eee02 -s ours am: 069590adbb -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539161 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie667f45f603b28969397f9c3be6aadc397898e11