commit | aae5671b5adb428e4afa1205d7c96b50affb2dce | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jul 25 13:38:00 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 25 13:38:00 2019 -0700 |
tree | 8d58271580502c0a081878a9c6396b31d164a36b | |
parent | e6fb43cff377ccbb7e55d730f65572f25c8d9b60 [diff] | |
parent | e6283fda6d138f1b9a7021fc922a4a012f1ec9d8 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: e6283fda6d -s ours am skip reason: subject contains skip directive Change-Id: I9e814d15fdf82faae92e02a216f5d4bf6ba19ac0