OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorBill Yi <byi@google.com>
Wed, 27 Apr 2016 19:56:10 +0000 (19:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Apr 2016 19:56:10 +0000 (19:56 +0000)
commit1e21b15db1d9fdcbacbee7b336327e69a8f57ae4
tree0d84385350aaeb276f0bfbdf76b9c4dc009befd2
parent3cb641e25d42c1a9396735821337702460dd983c
parenteb50d20504dc31e562f6687298de3aca7d011896
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: eb50d20  -s ours

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

Change-Id: Ic9e597c9fe422865b44113e31f0e49567f0f37e4