tree 015c75b9b61611bccfb494e7d848ec246337f6b6
parent 6587189faa560ad757bd8931b0fb45c1155d0932
parent 09e948703f0d7f68baccb2e8a2b968dd672f6f77
author Bill Yi <byi@google.com> 1465332738 +0000
committer android-build-merger <android-build-merger@google.com> 1465332738 +0000

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

* commit '09e948703f0d7f68baccb2e8a2b968dd672f6f77':
  Import translations. DO NOT MERGE

Change-Id: I634ab0e0f9415689f4178b534244debd407b0092