OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 6 Oct 2016 20:25:02 +0000 (20:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Oct 2016 20:25:02 +0000 (20:25 +0000)
commit9474a63f5004db397fd21285816d2a3c72d526d3
tree01ec264146518fadb384c6c136e75fb240030a7e
parent778f8930b4434ee0f4dedd8c078d240e0ac091ae
parente03f970ab46cf1f5986a80534240ac4df0d3728b
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: e03f970ab4  -s ours

Change-Id: Id98b3d6c2ced3b7734021533d8ff4acc24023acd