tree 1122dc2a77196ad291c8c1a1764259ba0c8ce5f9
parent 9c844248141cbd22819cbcf54cb45f293243202b
parent e9c5f8925f79e559be64202117d7e89c29034304
author Bill Yi <byi@google.com> 1465266498 +0000
committer android-build-merger <android-build-merger@google.com> 1465266498 +0000

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

* commit 'e9c5f8925f79e559be64202117d7e89c29034304':
  Import translations. DO NOT MERGE

Change-Id: I6b28d550dffca34e2c5ce27dcd289d12d013d177