commit | 1187edbbf9e12d8283a6413353864746fc899542 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Jul 06 14:35:37 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 06 14:35:37 2020 +0000 |
tree | 14c2f9a0d1746438eb6ef897297c6b0c8e48e4a9 | |
parent | ee6869d9a64b75faca17386e19ae5c3b4808a8a6 [diff] | |
parent | 58c18b6fd69313e03ce89d0ba5b3c77aecac5b80 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 1cdb57b79a -s ours am: cce78f1da7 -s ours am: 2d8b962698 -s ours am: 58c18b6fd6 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086566 Change-Id: I0d18068d8cd1bf35c651b34c9e5c39d4719c64be