commit | ff59a09b07b6fbcf74a7c5fa7b71fadbc8ad9de9 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Aug 06 03:22:33 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Aug 06 03:22:33 2019 -0700 |
tree | 30a9dee09a0cac6c83d0eab50950e0467edc1145 | |
parent | 2bb6734240a0b7ac67e7129d0f493fe377d81933 [diff] | |
parent | 80940c8826e62746924f2b093de03f4b5de6fdd9 [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 3ca8c70e38 -s ours am: 2a6dabcd6a -s ours am: 80940c8826 -s ours am skip reason: subject contains skip directive Change-Id: Ib0ac478c71e05a3546e652d49fe3b7bf714b97db