commit | afe8fe061222b09d7df0fdb84ff93e6d683599cd | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jun 13 21:57:58 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 13 21:57:58 2019 -0700 |
tree | 869fa6a4f9fdb2f1cc0d67a228a078da02388f70 | |
parent | 2f7bf636c9547c1df8d2f7354f8674e4dd8360e9 [diff] | |
parent | 33a26fa99156ccc54b4278d509b96ef3bb227f1f [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: cf1faa7e38 -s ours am: 33a26fa991 -s ours am skip reason: subject contains skip directive Change-Id: I540197e43d01200af093d1df60bfeccc6ebca52c