commit | 5ede8c526af8fc5d4e6c617f3cc9b02a768fd415 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Oct 12 12:48:25 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Oct 12 12:48:25 2019 -0700 |
tree | 281b488ff00e961dfcf06a6759d146f8f66eaef0 | |
parent | ed55f25bf9bc3330df4971d3dedfe4b79c430400 [diff] | |
parent | 9a4bc0c15f20e60c68709dc16ea9d3d7e4ac4dad [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9223659928 -s ours am: 545560b547 -s ours am: bea0b23926 -s ours am: 9a4bc0c15f -s ours am skip reason: subject contains skip directive Change-Id: I0a92bb590453f8e1fced99a69701c0e2cca1bde1