tree ac91923d22e9abaee9b4d70c636788cea8526926
parent 666a8246f42a3408e01a10898cafed5f23b2af7c
parent 1fb300e2722e7f73bb25c2cf2cf58385d055f86a
author Bill Yi <byi@google.com> 1498918443 +0000
committer android-build-merger <android-build-merger@google.com> 1498918443 +0000

Merge "Import translations. DO NOT MERGE" into ub-launcher3-dorval-polish
am: 1fb300e272  -s ours

Change-Id: I43042aee6bf5afbf0cdc30d090f388483b27eaa9