OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 3d9d9fa0d9 -s ours
authorBill Yi <byi@google.com>
Fri, 3 Jun 2016 17:13:02 +0000 (17:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Jun 2016 17:13:02 +0000 (17:13 +0000)
commit650a2aad33720c0270593003c2e4078ba6d49feb
tree8d7e5311c0b596c5abecd47fa8c19d9f757cfdb1
parent83680a1c3dc8aad2f7990279a1bf951cce215c5c
parent67ae5a22517ff68547171588c09ae9ce3e95080b
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 3d9d9fa0d9  -s ours
am: 67ae5a2251  -s ours

* commit '67ae5a22517ff68547171588c09ae9ce3e95080b':
  Import translations. DO NOT MERGE

Change-Id: Iab1bf41b422aa0e7bd8508b2c7afb288f6413497