| commit | a925b169a50fba83b2a8fc488a4d54472c36a71e | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Sat Dec 05 22:14:48 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Dec 05 22:14:48 2020 +0000 |
| tree | 9d540a4ed60c6b01960f5c80a8414b19a574de3e | |
| parent | 062c0b37b16e9f3d3f972abf1aefb6b424cd6e16 [diff] | |
| parent | bc0e7c7956b32ae019a639d729697f00c5507b78 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b4c94b4110 -s ours am: bc0e7c7956 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13169560 Change-Id: I8b75a7730bd0339bc456eb8753ee863f08ca1dc8