commit | 28333015d658c10578c1ed5c6dd4877aa2cb06ae | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jul 18 15:08:35 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 18 15:08:35 2019 -0700 |
tree | deb206a7efa6231977dad27724f53ceb613b63bc | |
parent | abb7a328aeb4f2b71d78075bedf0464f51cdeec2 [diff] | |
parent | a090c99dd68c965700460e0ecdbd66b36f48ebf3 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: daeb1bb863 -s ours am: a090c99dd6 -s ours am skip reason: subject contains skip directive Change-Id: I431e6368b9bf0d1ee69ab905a7d4011789d3f2c2