tree 8f9924f77715f62598693b78983524494f1399e2
parent a2af30b08f7216cb374b35973d0eab76fd5e1e68
parent c32e63fbda506cc9caaa38f83a0d58fc138b5cf3
author Bill Yi <byi@google.com> 1466748362 +0000
committer android-build-merger <android-build-merger@google.com> 1466748362 +0000

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

Change-Id: Id493ab7235ae19c3a4faf74a11c8f7d6074c45c8