OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into ub-launcher3-calgary
authorBill Yi <byi@google.com>
Thu, 30 Jun 2016 03:17:18 +0000 (03:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 Jun 2016 03:17:18 +0000 (03:17 +0000)
am: 798f95552b  -s ours

Change-Id: I3b3fcd195350c100140b6278a8f91f3b0b4e529e


Trivial merge