tree 56d8e2aae6311658ae89832c54cb5166a14f0c73
parent fda3107c8b7c88bb07f6d54d238b8326220ea7be
parent 45febfec5408151a513b94095e47dea07fe3d264
author Bill Yi <byi@google.com> 1495222615 +0000
committer android-build-merger <android-build-merger@google.com> 1495222615 +0000

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

Change-Id: I45c8936ad2900bddc3133ffa5f105ea496d2eefb