commit | 297d04f1d12ca733be73697040b24df26834f340 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Jul 06 14:23:08 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 06 14:23:08 2020 +0000 |
tree | 4dc1880b8fa57b28ce990067e0049c0f065dcc8c | |
parent | f543fb5832fb7114089fcb59ffd6c2df46e546c7 [diff] | |
parent | a44b9c4c08453e58cdaef3457e782c042567f481 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 9f7daa495f -s ours am: 69c10a41ac -s ours am: a44b9c4c08 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086501 Change-Id: I527976cfa11519d026119ce58a18fd127314d465