OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: 242c3c497c -s ours
authorBill Yi <byi@google.com>
Thu, 22 Jun 2017 13:47:15 +0000 (13:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Jun 2017 13:47:15 +0000 (13:47 +0000)
commit1d0b54c6853d5a3c22a6bb392a4030c159152a5b
tree1fa6669d44ca78cff009d06ba9ed36dc51e7be07
parent3370e44417da4490d79af3b10dd4a5e5f62a8928
parent4b209f21b647645d0013878637749f6c187fa230
Merge "Import translations. DO NOT MERGE" into oc-dev am: 242c3c497c  -s ours
am: 4b209f21b6  -s ours

Change-Id: I438f9ea34f83513db4d43b7c6bc0f46c13d8d712