commit | e6a4abfd3c0f4162806f2eaa1bdb5fec18f84551 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Oct 12 11:07:24 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Oct 12 11:07:24 2019 -0700 |
tree | 971103a8ee9d4c50783f078b72b016c77998c6b2 | |
parent | aaf3e86fb8f5736eea8c8c1793a22f56959ded7e [diff] | |
parent | 6f4a9d32bb129d43fd9bb641c8d9265518ba2a8b [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: e801eb78f0 -s ours am: ffe1c80f35 -s ours am: 6f4a9d32bb -s ours am skip reason: subject contains skip directive Change-Id: I1d56a79559cfb30c8c8c3e6b363245115c8f2254