| commit | f9c1edade32b00dcbb4c6025a81423217e5af19e | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Sat Dec 05 22:13:43 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Dec 05 22:13:43 2020 +0000 |
| tree | d3aae18ea1e1092585182efd404fb86d0cbda374 | |
| parent | 694ad9678ad1408b8024fe88d601999dd316d7e5 [diff] | |
| parent | 7ca181e71b9f7da157ce682aca58e420771fff5a [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 52274b08b8 -s ours am: 7ca181e71b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13169685 Change-Id: I538c7d7e57b00fe8dcaecafa5c9ae109966269bc