commit | 50dc17d8bcca59085f04222183ffeecd5d228cbe | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Jul 30 11:32:38 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 30 11:32:38 2019 -0700 |
tree | ebcbc2c0e6b5914c93c11f6010fa9fa55f07f123 | |
parent | 42861b21c9782567f9e65eb1eda6386523f0e1b6 [diff] | |
parent | f63cb669ff1b3e5664d1e7e66b6c037ce72a33a7 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: f63cb669ff -s ours am skip reason: subject contains skip directive Change-Id: Ia87ca65aaf5bf3f43c2d15b944bdf06a74f857c6