commit | 320828c38c41684e4668cf76f5f9de0cd8ebf7b4 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu May 09 14:19:25 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu May 09 14:19:25 2019 -0700 |
tree | ced2af4712748490ba26b5848fa21d0138122abf | |
parent | 06b3a4c723417bb3b8bc6496795b2f142b434390 [diff] | |
parent | fdc69d04fc6f275bb29013f69390c573d6ff1bdb [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: edef247681 -s ours am: fdc69d04fc -s ours am skip reason: subject contains skip directive Change-Id: I193fde9d1ccf34995e8e41a7cc3754ef69abacf4