OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into ub-launcher3-calgary
authorBill Yi <byi@google.com>
Thu, 14 Jul 2016 15:11:11 +0000 (15:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Jul 2016 15:11:11 +0000 (15:11 +0000)
am: c22e626217  -s ours

Change-Id: I2dd11d298ec4a38dc03aa4e014ec0686dd3e387d


Trivial merge