commit | ea2172b63a20a104ba522207d43dd0e226486785 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Jul 06 09:26:30 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 06 09:26:30 2020 +0000 |
tree | a73c3b5e96002b0c1f1efb28186700f557c6a78a | |
parent | c903018717653b8e26ea8d94018db410529af18f [diff] | |
parent | f56508711e43dd3791d1827eb42d631a235898a1 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 65997ef7b3 -s ours am: 3d121d3920 -s ours am: cf3a5fb7b7 -s ours am: 235ab96169 -s ours am: f56508711e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12079859 Change-Id: Ie4ae8d1ae3a5eaaa83556320117627b2aa2c6b06