OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Thu, 11 May 2017 01:21:10 +0000 (01:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 11 May 2017 01:21:10 +0000 (01:21 +0000)
commitee8789939e46b2018308a52ff025889d9891a434
treef2d464fec6609133218cfc12d71a323f6e55214b
parentac1b935437429de36c4b986f59a5646250fd4999
parentf1730bee90c2f6d1c1a379b3e2153e3847af5e76
Merge "Import translations. DO NOT MERGE" into oc-dev
am: f1730bee90  -s ours

Change-Id: Ia9300d42352834b86cd789d6e8167d0c47220a65