tree 9ecf08449c7596b2885b46a5163756e9cbb9ec39
parent 9f9c05e7a87134bbf1f4c2e17370f8aa565fe768
parent bf6e01ced5a2d04bbdd7cdde86bd370f86865739
author Bill Yi <byi@google.com> 1469765548 +0000
committer android-build-merger <android-build-merger@google.com> 1469765548 +0000

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

Change-Id: I00e17922016c5ff66d433948e4e294fc530e5121