OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: f3d2c06146 -s ours
authorBill Yi <byi@google.com>
Tue, 7 Jun 2016 02:40:50 +0000 (02:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 7 Jun 2016 02:40:50 +0000 (02:40 +0000)
commit7ca38bd8e798e0d6417eaebff76d219827b6e82d
tree927d2a8b81c5fcdf7eef777fd2792babce3d5f31
parentb9e8801f85368ab8ac6609531d39c14612d61602
parent90c64f02f20db0b918c3b9c26d76a8dce3e4e576
Merge "Import translations. DO NOT MERGE" into nyc-dev am: f3d2c06146  -s ours
am: 90c64f02f2  -s ours

* commit '90c64f02f20db0b918c3b9c26d76a8dce3e4e576':

Change-Id: I9e305546e7aac8e3f40814633b2450ce3897b713