OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: 7c23c990f1 -s ours
authorBill Yi <byi@google.com>
Thu, 22 Jun 2017 13:49:27 +0000 (13:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Jun 2017 13:49:27 +0000 (13:49 +0000)
commit2a8069da03d43d1e933d4b7db5924b4a4e4c09ce
tree1fa6669d44ca78cff009d06ba9ed36dc51e7be07
parent58df3f4b2e6a8b8a1d2944ab4461e5a6b208dccf
parent131ccb00a8f62076769d38bc6d335eafa7fd7bc4
Merge "Import translations. DO NOT MERGE" into oc-dev am: 7c23c990f1  -s ours
am: 131ccb00a8  -s ours

Change-Id: I12baaccc938a1fcccdbc1ad97a18b802ffdee691