tree 915794abf6b3b1cc6d77f10fb595ba5b0b18d6ee
parent 460a7c96d40c1a3d4a0dffd3e0340fb36f859f03
parent e8af8a65bcf9c4c9c2c60e082153278a8e8d5cec
author Bill Yi <byi@google.com> 1469465365 +0000
committer android-build-merger <android-build-merger@google.com> 1469465365 +0000

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

Change-Id: I54b0af65116278dc870e157f2c36a632039513a6