commit | e940f70dd7a0985b1b4c58bd564ebcd15a4a8eef | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 07 12:29:27 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 07 12:29:27 2019 -0700 |
tree | 24eecfee6998beccca41f1d0ee14350b5c5eaa9e | |
parent | cd0c21fc15324a5604f34eb4a28c4565a7879c15 [diff] | |
parent | 6a776ea2c246ad3dd443d7c15441c1c23ecbb3df [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d07bcd4b0d -s ours am: d111518938 -s ours am: 6a776ea2c2 -s ours am skip reason: subject contains skip directive Change-Id: Ibdde1601bfe4b890a5f904b89715a672a9df94ca