tree 985174c3c8d59f92f99a5f79e48a04462aa4665b
parent ce08a261335636d0fb839d8d788faaf1a30060d6
parent ef6c04633c8d5610f783e459d1d209955ce537af
author Bill Yi <byi@google.com> 1474946719 +0000
committer android-build-merger <android-build-merger@google.com> 1474946719 +0000

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

Change-Id: I64c1545e8fcc4fd1b88f1d31f045a151cc9e0704