commit | d6554f6a174bc634af14a6884efafba1cb1cdb3b | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Jun 25 18:03:39 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 25 18:03:39 2019 -0700 |
tree | 909e7b4d3be0583a813ed145952fb215f344f3db | |
parent | d382a6de7796a27a7df5dd82e4b0c1125f2429ff [diff] | |
parent | 4422e50d8f49bc782f6e10c769c702bc06c8670a [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: f91454e72e -s ours am: 4422e50d8f -s ours am skip reason: subject contains skip directive Change-Id: I865a8fa934fa52b43b807ada3e1f99278ede4c83