commit | d0680538327b462e4cf8b727a924ab21f33c7572 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sun Jul 14 23:20:10 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sun Jul 14 23:20:10 2019 -0700 |
tree | 2981279f76e1c2a5a2b28d4a640c55c2ae15eb90 | |
parent | 97916f9e67c999c3df49a7edd7e1abc92d7966ff [diff] | |
parent | 2c14f3f98e0a307cb487d5616b4c34eb7d549240 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 2c14f3f98e -s ours am skip reason: subject contains skip directive Change-Id: I30cb4d57dde6ff8aafd65c849a1a011a77d86bb4