commit | 413451ed23a6d5ef4cf370eae867a799793c454f | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jul 05 19:09:26 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jul 05 19:09:26 2019 -0700 |
tree | 4f263fc4a334fe11d21fc5125ff4c7070075c595 | |
parent | 95a636d394fb2d3bad744228266cb9e0c423da02 [diff] | |
parent | c0addd1f5ab12d71458ea60baad027896429b002 [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: b37de73103 -s ours am: 0e5c34bb38 -s ours am: c0addd1f5a -s ours am skip reason: subject contains skip directive Change-Id: I15f5e9e361edf4a6491a6e04cf70e826d91bdc53