commit | a9d47e02c17c951083f33222657e6f67e1974944 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Oct 12 12:41:43 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Oct 12 12:41:43 2019 -0700 |
tree | 3b1b9217cf9d5c3a32a0a3c830ea3f88c15fe73c | |
parent | a8b8b8a541d011d71c8e41f1dcdb2e75bb502071 [diff] | |
parent | 5f9a1f096a238c8cc8c39c3e1bb2d6edf3e234fb [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9223659928 -s ours am: 545560b547 -s ours am: 5f9a1f096a -s ours am skip reason: subject contains skip directive Change-Id: I5c32b1d921da8a9616cc728e41a2f45dac07aaec