OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorGeoff Mendal <mendal@google.com>
Wed, 23 Mar 2016 14:35:01 +0000 (14:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 23 Mar 2016 14:35:01 +0000 (14:35 +0000)
am: b568576  -s ours

* commit 'b5685764727d93ff2e6dd59249464dded120947f':
  Import translations. DO NOT MERGE


Trivial merge