commit | ed55f25bf9bc3330df4971d3dedfe4b79c430400 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Oct 12 12:48:01 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Oct 12 12:48:01 2019 -0700 |
tree | 281b488ff00e961dfcf06a6759d146f8f66eaef0 | |
parent | 7704960b61068e89a6ed14dc07b84e9db4ad7ade [diff] | |
parent | a9d47e02c17c951083f33222657e6f67e1974944 [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: a9d47e02c1 -s ours am skip reason: subject contains skip directive Change-Id: I708bb1bbb61a638db4df643d3b574be1cbd6180b