tree 5d714ed2203a4512341bd7c299bbe798a619af8a
parent ea9b82baaabb3e82a9735b7391d1a77ac98b3811
parent c9efe2ba9ce41d2b6b94346bd39d9684694c6d70
author Bill Yi <byi@google.com> 1471381654 +0000
committer android-build-merger <android-build-merger@google.com> 1471381654 +0000

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

Change-Id: I1fbfd1be22e96d99d05a76e480fc6dca290bc519