OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Wed, 31 May 2017 18:30:00 +0000 (18:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 31 May 2017 18:30:00 +0000 (18:30 +0000)
commit8051830544bb42579fb2a72c445fdf27ef39b664
tree1cc711b4ac02a764b96f60228b00abb86508a851
parentfeb24b20d07edcc2354854876096ded93695b3b9
parent42f81ee464960ff6398ddbcde9038157719b74ca
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 42f81ee464  -s ours

Change-Id: I6aef4a656ed7bb29f04921dc5fc25ad5530c7ff7