OSDN Git Service

Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 3638c9b330 -s...
authorBill Yi <byi@google.com>
Thu, 21 Jul 2016 03:55:35 +0000 (03:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jul 2016 03:55:35 +0000 (03:55 +0000)
am: ffbdc55a1d  -s ours

Change-Id: I6e0abeb5cf3064d95bb562ac8cca5d5b944b6316


Trivial merge