commit | 35d50b84a62164954af15c70182a9b7df975d837 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jul 12 14:33:41 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jul 12 14:33:41 2019 -0700 |
tree | a1fc20362699a0cdbcd3b5f7c7f1f64240f89201 | |
parent | 20c1b60d8cb9ee62c1c7148a15d572999c2aa13a [diff] | |
parent | 1feb0dfde833e5f9247135579e816b579c1b32f2 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 1feb0dfde8 -s ours am skip reason: subject contains skip directive Change-Id: I9de11f339446e4c75d659bbb6e31ddd277b4aca3