tree e8f25bc0d8212cbc36dbf99be1247834b8a481ea
parent dd592da88f61e75050399d9361d8d11fb718ecab
parent f7f41bd4fa149f1c876e2de05bfb532aa1b8c3f9
author Bill Yi <byi@google.com> 1475134782 +0000
committer android-build-merger <android-build-merger@google.com> 1475134782 +0000

Merge "Import translations. DO NOT MERGE" into ub-launcher3-calgary-polish
am: f7f41bd4fa  -s ours

Change-Id: Ia9a560e703630cc152ea32c667b49b37a7caee5b