commit | 3c34de5df28374cebfba20ff0a5cba488aac5284 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jul 25 15:00:47 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 25 15:00:47 2019 -0700 |
tree | b83fa54958d337891ecd88273b4ac1955bd7fb61 | |
parent | fffdf3589dd4fd53b6f6bbfa403b4bb3c049cc6b [diff] | |
parent | c7f1a16c22f1229b8438f1de9763903f0471e74b [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: e6283fda6d -s ours am: 5304b688a3 -s ours am: c7f1a16c22 -s ours am skip reason: subject contains skip directive Change-Id: I356e923770a8711ceced0068a41093ae560d5a98