OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorGeoff Mendal <mendal@google.com>
Mon, 15 Feb 2016 16:49:57 +0000 (16:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 15 Feb 2016 16:49:57 +0000 (16:49 +0000)
am: 5933341910  -s ours

* commit '5933341910b78af207450cfaf77b2c7d6a779568':
  Import translations. DO NOT MERGE


Trivial merge