OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: d5f7c20a26 -s ours
authorBill Yi <byi@google.com>
Fri, 27 May 2016 00:29:59 +0000 (00:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 May 2016 00:29:59 +0000 (00:29 +0000)
commit202f94bb11d646879b5cf630144264d3f7d0aaa3
tree7c5068965daf7aeb11b57f147a9328046ed3ad38
parent034fb9184e3d6e764c8364b20b87282c5269cab1
parent1c6e3e571fd133a7a888fa3c4b37c9b8e3232da5
Merge "Import translations. DO NOT MERGE" into nyc-dev am: d5f7c20a26  -s ours
am: 1c6e3e571f  -s ours

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

Change-Id: Ia54f0858fa61d2d2fc6b1c19b13fee6c5053df04