OSDN Git Service

Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: f1dc57ea63 -s ours
authorBill Yi <byi@google.com>
Fri, 24 Jun 2016 06:02:31 +0000 (06:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 24 Jun 2016 06:02:31 +0000 (06:02 +0000)
commitde2e92675f499bf284942cd83f300328d118e0f4
tree89b3178274dcfef8963b95eb34bbddb9b9953882
parentefb204d54dbda6e665b62eea47be435d23dc21b3
parentf0101fd5cbc898d05363831d039cfbcc0befa7d8
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: f1dc57ea63  -s ours
am: f0101fd5cb  -s ours

Change-Id: I68b6a3c5efc104bcff05b5b52b618102b54b05ac