commit | 23922410c3432686cd80dfb0d50ac80397495226 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Jun 01 09:38:12 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Jun 01 09:38:12 2019 -0700 |
tree | fefbadbf9f76394b92c3ec6d372aa4183a2b6894 | |
parent | f75bd54b8372cec36e6169297f676b9f2aa53993 [diff] | |
parent | ae7fd0f5018e459bf0bad7e28fb8755c197cc655 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: ae7fd0f501 -s ours am skip reason: subject contains skip directive Change-Id: I9a6c23b21dc432c160dc647057ac15fa8c2c68bc