tree 5d714ed2203a4512341bd7c299bbe798a619af8a
parent d8a5f69fc4d39d81b8f13083ec4a6f39f7dd40d9
parent 950e8ed321551ae63ec2150c4dbd6085af1f44a3
author Bill Yi <byi@google.com> 1471381811 +0000
committer android-build-merger <android-build-merger@google.com> 1471381811 +0000

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

Change-Id: I509713055b7d3e6aa2a7eac74d358cbd0f6dcfa8