OSDN Git Service

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

* commit '1bbbb1ddb7de1ff557e4c9c3cc950a5437034164':
  Import translations. DO NOT MERGE


Trivial merge