commit | e5b71422fed2052b9256becd9d2b1e608693030c | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Oct 12 10:41:40 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Oct 12 10:41:40 2019 -0700 |
tree | 58010163803f38eafdbc3549757e9f9190ef4b00 | |
parent | b4795def658f5e8ff761efd3042fd5809e34b043 [diff] | |
parent | ce4a39ddcaad4c9ce391e5fdbaa1a437cc877adc [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 458d825272 -s ours am: ce4a39ddca -s ours am skip reason: subject contains skip directive Change-Id: I66a5f72b48978492b90a384b2bc3b179d08595fe