tree 674b5bb014ea406f6540c78a125334efed45c538
parent 17112a7535455f83a1a4fbd8046c0da032badc54
parent 798f95552b9da671c2923bf960ecbe162a49213b
author Bill Yi <byi@google.com> 1467256638 +0000
committer android-build-merger <android-build-merger@google.com> 1467256638 +0000

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

Change-Id: I3b3fcd195350c100140b6278a8f91f3b0b4e529e