OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 438c3cbffe -s ours
authorBill Yi <byi@google.com>
Fri, 12 Aug 2016 09:39:38 +0000 (09:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Aug 2016 09:39:38 +0000 (09:39 +0000)
commitfa25ce0fe4365f3f18bf3ce83a431905453ba536
tree4636300d89a3901ef80da8b87db3d2c28626f270
parentb0998a883751f04590c25b338a8a4688a4afaca0
parent545c97d0b826474e5cda57ed97a20aefb0c0ce8f
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 438c3cbffe  -s ours
am: 545c97d0b8  -s ours

Change-Id: I4502b45acbe9c6e23f13bb8f2279bb31e8550cd5