commit | c19ed2a56985b2f659eae78ae11b4985a443110e | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Jun 25 22:31:07 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 25 22:31:07 2019 -0700 |
tree | 1c807ab7397f845f6f55753eae55f177480ccd7c | |
parent | 30dec36ef8294fdb9e1e797bfc270f0e2dd7132d [diff] | |
parent | 6e86fcac8adbf6f5f7a54e695a0f59d7db91bc03 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: ac121a2820 -s ours am: 6e86fcac8a -s ours am skip reason: subject contains skip directive Change-Id: Ic3652fac211980b4ed65b2ba02c13449b2c2516b