OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: 69ca32dcea -s ours am...
authorBill Yi <byi@google.com>
Mon, 18 Sep 2017 20:56:20 +0000 (20:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 18 Sep 2017 20:56:20 +0000 (20:56 +0000)
commit4b33ac2da33f2491b39e2b03123f463f95d90841
tree5f5ca1deb150ac477a60871237c3d51eab210c90
parent29e11599fb0e22ed75bd30e7104c10cad5587b6f
parentd33ed973396a7aa271123e07071258c4daefe1c3
Merge "Import translations. DO NOT MERGE" into oc-dev am: 69ca32dcea  -s ours am: 60af01bec9  -s ours am: 6c4c6b047c  -s ours
am: d33ed97339  -s ours

Change-Id: I209a4d9e4a7cfa4c019fa1d7c87a53e1298b1a71