OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Fri, 5 Aug 2016 18:29:01 +0000 (18:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 Aug 2016 18:29:01 +0000 (18:29 +0000)
commitacb237644c07eef292d3e597546589d46f19c0d2
tree8bdc9e5eedefcfb44ee6e87c13faf300a3512016
parentc2b38be10fcd37b1cbc4d5bdd612721c4164f8f3
parentb094ba47a721881b7383f216003b81a48c45c207
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: b094ba47a7  -s ours

Change-Id: Ic152eac3a92179537cb18ce715c500a96d376923