OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 86817456ff -s ours
authorBill Yi <byi@google.com>
Sat, 22 Jul 2017 16:33:02 +0000 (16:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 16:33:02 +0000 (16:33 +0000)
commit418530d4f4967cc22556e4ba0af4268f89bc389e
treec687fb1ed10c2d9bca3206b7385d2fec5fc70fdc
parentf5ba3d032150c8b9304cc11518771f8aa3a9efa2
parent4d681e127b037175be341e1bac349041718df430
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 86817456ff  -s ours
am: 4d681e127b  -s ours

Change-Id: Ibf37f62606eb31b3dadde411d91a501203a79b3f