tree 346ad08c54d8609756aa4f85184c3bb33131750d
parent 2c25197b37f791047b98efd6025d39870598b548
parent d7058f2b065a3c5e8176384178ae9932903b2b00
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-polish
am: d7058f2b06  -s ours

Change-Id: Iad3c5283a4e3dfe2b8732c68fc473483570e9c07