OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Sat, 8 Apr 2017 08:04:43 +0000 (08:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 8 Apr 2017 08:04:43 +0000 (08:04 +0000)
am: df12f01abd  -s ours

Change-Id: Iabdc2a26176481290232279bda74f73780d39cac


Trivial merge