commit | 46bdbc367517b40efdd11ae06c6b650dfb253761 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jul 25 15:05:27 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 25 15:05:27 2019 -0700 |
tree | b83fa54958d337891ecd88273b4ac1955bd7fb61 | |
parent | 3c34de5df28374cebfba20ff0a5cba488aac5284 [diff] | |
parent | 1344415994d8b8c39cfd2af789e75f52d2f5f708 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: da2d0d132f -s ours am: dbdccc805b -s ours am: 1344415994 -s ours am skip reason: subject contains skip directive Change-Id: I2f33c36e4938c6929d6faceab6f03884e5e37878