| commit | 858fe168ed7debb0994420dc1c250a494b7df063 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Oct 09 13:32:32 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 09 13:32:32 2020 +0000 |
| tree | 932a53ba6c741f1425208cf3b446adf94b6e4f8b | |
| parent | c9f402b6a376f92b8b9b867abb580670122af486 [diff] | |
| parent | dae77669aacfb1c96add145e67fa3995d793b248 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: dae77669aa -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12801147 Change-Id: Icd0b37cccc71c28d31d42ffc847ede4986ab5145