tree 59ba386ba032043bb93f520c477db9969baf2d73
parent 3293fb8eab16e05df69de9bdbe3b3bb486810399
parent c22e6262172cb5e8860e2073c5099f5aa1d6be83
author Bill Yi <byi@google.com> 1468509071 +0000
committer android-build-merger <android-build-merger@google.com> 1468509071 +0000

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

Change-Id: I2dd11d298ec4a38dc03aa4e014ec0686dd3e387d