OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: 63d52ca6bc -s ours
authorBill Yi <byi@google.com>
Sat, 22 Apr 2017 00:02:18 +0000 (00:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Apr 2017 00:02:18 +0000 (00:02 +0000)
commit12f0d55897b9ba717bf6dfd311c10fdbbcb53818
tree2254d2c0ca799c36c87a6dccab40ecac3620329a
parente790929946b9de413faed22e5f14cda52cc5a8b1
parent63ce39cfe62ee469da1c21b001611f86b2b6b9c9
Merge "Import translations. DO NOT MERGE" into oc-dev am: 63d52ca6bc  -s ours
am: 63ce39cfe6  -s ours

Change-Id: I3c36011aff2035d32193ab7c3b73e4036af9280b