tree e2451788a5bfc46dc2f0fb501588d9005d73728c
parent 7c67e894badf1aed3e75535eaa542b5f6ea34593
parent 081fbed94010e5e80d837487dbf2a40960626c01
author Bill Yi <byi@google.com> 1495222747 +0000
committer android-build-merger <android-build-merger@google.com> 1495222747 +0000

Merge "Import translations. DO NOT MERGE" into ub-launcher3-dorval am: 45febfec54  -s ours
am: 081fbed940  -s ours

Change-Id: I8052b3deaca226f22abe7f92750455b866d14c7d