OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: 71ffd8bc87 -s ours
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 May 2017 16:15:44 +0000 (16:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 May 2017 16:15:44 +0000 (16:15 +0000)
commit23e27efc1181018d6d788b77168cce585f599920
tree356d850fdd3cc21d6135527f1637534f2d6ef7d8
parent8386225861aa1a88659a438ffc1305d540902322
parent3db706109bbbd5e22b28f05a8b87e8c3d70dbfc3
Merge "Import translations. DO NOT MERGE" into oc-dev am: 71ffd8bc87  -s ours
am: 3db706109b  -s ours

Change-Id: I40daf0ddcc9e14070a6e585fe932632e08752cce