commit | d6d43aab71ac199436b299fadf8dc5aac9fac6b2 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Jul 09 15:24:53 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 09 15:24:53 2019 -0700 |
tree | 06d283e6a354f0ae6f938744b27e0a58b90a3d68 | |
parent | 4d662f8e762b763ed5799d719ab5399d3fc02fe5 [diff] | |
parent | c4cedfc4521cfd0f9aaceaac923e5199bbb1aee1 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: a5121a4fa9 -s ours am: c4cedfc452 -s ours am skip reason: subject contains skip directive Change-Id: I348b2718f8391155067a6faa325bb8e1cfe2b849