commit | 2e5d35145d577cc94603f36df7048b8d25365b6b | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sun Jul 14 18:05:23 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sun Jul 14 18:05:23 2019 -0700 |
tree | 784b697094684c896cc3bd7fac6be298f5425444 | |
parent | ed54d0bf9d4ede3e3069ed7838f22c2fc236692d [diff] | |
parent | 02d6f14ad021452344bb47215d7f276ca7d50cca [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: a76086102b -s ours am: 02d6f14ad0 -s ours am skip reason: subject contains skip directive Change-Id: I01e68df28f7f865c49e023c8d4a563a9a718876a