commit | 9b1c52928683c0ca56b809054fbe7c3b129d4896 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Jul 30 12:24:39 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 30 12:24:39 2019 -0700 |
tree | 8dfc6a78c356debfe3bc60265b58610fa1d8ebd2 | |
parent | d297b9d450cabde6020250b3889ae6dbb79438f7 [diff] | |
parent | d0353c05da98411a7b7a0df4d5d3d8463cdd3c27 [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8292b6bb44 -s ours am: b0d1548ece -s ours am: d0353c05da -s ours am skip reason: subject contains skip directive Change-Id: I2e09e797b89c6232679f358df5ec3e6050dbf265