OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7f1b86e5df -s ours
authorBill Yi <byi@google.com>
Fri, 6 May 2016 14:32:55 +0000 (14:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 May 2016 14:32:55 +0000 (14:32 +0000)
commit64b3799ff8f23ebf522feb17485a53f75f1ed173
tree238ef7632ec0ebc06eff83e5c9283102bd3bd632
parentd33940e1480b8c0062e905dd59e69e1a1d80e796
parent19f57505a0a894386f8cd39ead0545e1afcd45dc
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7f1b86e5df  -s ours
am: 19f57505a0  -s ours

* commit '19f57505a0a894386f8cd39ead0545e1afcd45dc':
  Import translations. DO NOT MERGE

Change-Id: I7858ba5ad58e8954035dfdbf8b197fadf1771ae8