commit | 181237a2467ea79ef65aa91eff558e0342f9dc6a | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Jul 30 11:49:46 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 30 11:49:46 2019 -0700 |
tree | 43f54d8049a2ede94e0017d632ada745b86950fe | |
parent | eaf0683981c93bf4d6bba87857c680f7cefb8d50 [diff] | |
parent | eaadb371c51506551a281ce7ab500a199b37dc7c [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: eaadb371c5 -s ours am skip reason: subject contains skip directive Change-Id: I0d3782f16b6a9c7715c44e6405cb1bd48d9372c2