OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorBill Yi <byi@google.com>
Wed, 6 Apr 2016 17:26:18 +0000 (17:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Apr 2016 17:26:18 +0000 (17:26 +0000)
commit5a979a6fd5b7ae333c40ce73cb14da167edad3de
tree7b0ff6dbd6d07189c5d05bab3a1e14f460ef3217
parent37ac1d5d46daef83558d2f5b7e7ec8071bf380bc
parent2de9313d2ce487bbf9ebdbdee3cbb040c0bcd711
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 2de9313  -s ours

* commit '2de9313d2ce487bbf9ebdbdee3cbb040c0bcd711':
  Import translations. DO NOT MERGE

Change-Id: Icfaededc7c12f9ca73b03d37680e589e5ecda14b