commit | b6cd94472d7969b4214de640674b60b832db8383 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sun Sep 22 13:08:04 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sun Sep 22 13:08:04 2019 -0700 |
tree | 36a83a279d880f854bd644cf937b9bac21a1d336 | |
parent | b355d935f3c664f55ad3fc6782961a6dcc27a746 [diff] | |
parent | f5e74d30d660f92ab5996ec89a57c449eb3adc0c [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 59e1c0a768 -s ours am: f5e74d30d6 -s ours am skip reason: subject contains skip directive Change-Id: Iedf4b71e4cc4b2f81145cb2219c2413fb70412d7