| commit | 0ed554de4dc06c75c52b1980aa4a4cdf38ae0bba | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 03 11:39:52 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 11:39:52 2020 +0000 |
| tree | 6bc1d197a89b4fc8733f35a0d78a7dde37e37be7 | |
| parent | afee36a31fefdb470dc9aeeaa09e8c9b882adbb2 [diff] | |
| parent | ebf0113be08875667b7c2798d9af320448707f8f [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f8553f99ac -s ours am: 324645af29 -s ours am: 0b43c0f70e -s ours am: ebf0113be0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12514865 Change-Id: Ieee5238441df83124146a0197e47ba3dac772732