OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: a980312abf -s ours am...
authorBill Yi <byi@google.com>
Thu, 28 Sep 2017 16:25:28 +0000 (16:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Sep 2017 16:25:28 +0000 (16:25 +0000)
commit3ef3191d7feeae95271effb23c4277bf87994345
treed34dd60368c091973d370a7b7bb9f490886f79ab
parentfd31b789f9423a4eb320ef49a916258f134fa9bc
parent8a18b56711760552c6a5f84c5bfb34c0f3d38ae5
Merge "Import translations. DO NOT MERGE" into oc-dev am: a980312abf  -s ours am: 9f05e68ea5  -s ours
am: 8a18b56711  -s ours

Change-Id: Ife31a8953c068fd71096d96c2ee306dcfc5d8bd2