commit | f44e8d06b268ec75a2ca66f9566cb55b05a60fb0 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Jun 18 08:12:19 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 18 08:12:19 2019 -0700 |
tree | c1d7ddd47896f4047d307169973e794f2941b029 | |
parent | a6b2800ea911d25f23dfe8608397e24922c837be [diff] | |
parent | 0159a56eb0bd1bc36a9ea1837b31e6bb88e1f575 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 32bb8f9993 -s ours am: 0159a56eb0 -s ours am skip reason: subject contains skip directive Change-Id: I6b2d10370d7102e02773b267a945d923c390e6a3