commit | 4bf7bb1b8d684dbb5b23d8a66edb2caf84e7287a | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Oct 12 10:59:38 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Oct 12 10:59:38 2019 -0700 |
tree | 3b1b9217cf9d5c3a32a0a3c830ea3f88c15fe73c | |
parent | fe1d338fa1096f58619cc9db6fd2e43457360456 [diff] | |
parent | 3e5c5b08bbff3a327f4221d2cd7003fae66e6089 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 8d5ac64187 -s ours am: 3e5c5b08bb -s ours am skip reason: subject contains skip directive Change-Id: Ic1d35dee7e21c56a1b53863b8d9efb3412a2f3a6