commit | aaf3e86fb8f5736eea8c8c1793a22f56959ded7e | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Oct 12 11:07:03 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Oct 12 11:07:03 2019 -0700 |
tree | 971103a8ee9d4c50783f078b72b016c77998c6b2 | |
parent | 0a1ca27859074ef0c69001ec66807c5914b27956 [diff] | |
parent | dcfb6770e9e9e52cd3d55181c464e0cee10ca632 [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: e801eb78f0 -s ours am: e92a1a9c2a -s ours am: dcfb6770e9 -s ours am skip reason: subject contains skip directive Change-Id: I0f1b55f13e5501f20bbe7a1f0120b38b4a4bd7c4