OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Fri, 26 Jan 2018 21:18:18 +0000 (21:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Jan 2018 21:18:18 +0000 (21:18 +0000)
commit6331bfd20963d2da0f22db439d1efea79248ea3e
tree6eabf8ba0608a0a5669a02e2b9e8fac368cba203
parent9be01e02589715a7377998df9ebb8ad3b4883aae
parentc95d9b29e200ef597eb4a41503897ce30e48cdc8
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: c95d9b29e2  -s ours

Change-Id: Id188e8eb53b6b3e9d0c468b550fc5ae4ad602289