tree 427a9beef02ac5cac532c90113bb5085ee09f689
parent 36162b6ebf398e8e6c1f8c3328cc60be566ce9f7
parent 2f3b0b7e3b634d7e17f457c961e5a7acd9bf71ee
author Bill Yi <byi@google.com> 1468921976 +0000
committer android-build-merger <android-build-merger@google.com> 1468921976 +0000

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

Change-Id: Ib0d03d9eb881245bbbc15a3c201a01938f076b1a