OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into ub-launcher3-calgary
authorBill Yi <byi@google.com>
Mon, 25 Jul 2016 16:49:25 +0000 (16:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Jul 2016 16:49:25 +0000 (16:49 +0000)
am: e8af8a65bc  -s ours

Change-Id: I54b0af65116278dc870e157f2c36a632039513a6


Trivial merge