tree 8136bc280952e76c61b3b11a0d92e4867f36b693
parent d9b32e4fc5804262d35770091071ecfd43385774
parent b4df05315db178b96745f09c1b90a42849836170
author Bill Yi <byi@google.com> 1565586727 -0700
committer android-build-merger <android-build-merger@google.com> 1565586727 -0700

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8931739c16 -s ours am: eb16f029ee -s ours am: 000a882ba3 -s ours
am: b4df05315d -s ours
am skip reason: subject contains skip directive

Change-Id: I1212471b8de21c728f83fabe4f4e855206b88ee9