tree 5cedac96c832a8a3e7b23eb0b0dc1082eaa581e4
parent 20a51f8fe4b83f7d24dfdc0bd214fabae9b05298
parent 3c62137adf79673abb5400da7e310df11f61c932
author Bill Yi <byi@google.com> 1464283727 +0000
committer android-build-merger <android-build-merger@google.com> 1464283727 +0000

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

* commit '3c62137adf79673abb5400da7e310df11f61c932':
  Import translations. DO NOT MERGE

Change-Id: Ic214b463fc7ef3ab01cd764d19f74cf0b675a349