OSDN Git Service

Merge "Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9bc30ce5...
authorBill Yi <byi@google.com>
Wed, 26 Jul 2017 23:55:41 +0000 (23:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Jul 2017 23:55:41 +0000 (23:55 +0000)
commitb5a2d21674b7663d701282191e6e063d4109e5dc
tree6d161c9bffdd16f5f681d9ff205fd20c463ac0dd
parent411887f73a4744f315881645f50225439f6c36fd
parent5c7bf3574e7a770f8b580e8df6b3c66c15f41c0c
Merge "Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9bc30ce545  -s ours am: 611a6ffe29  -s ours" into oc-dr1-dev am: 527cd8b04d  -s ours" into oc-dr1-dev-plus-aosp
am: 5c7bf3574e  -s ours

Change-Id: Ifc76b77e304af22a26345ea5e71775c3d7997734