OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: 572e338a4c -s ours
authorBill Yi <byi@google.com>
Sun, 30 Apr 2017 09:31:00 +0000 (09:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 30 Apr 2017 09:31:00 +0000 (09:31 +0000)
commit0725caa86245b478173279f31220d2e0ccccf901
tree9043216d8ae691189582856b7049efde07c16a50
parent1ef2a3f3e9ef1bb7218474de5e1d42817411e2d0
parentd8879e06fa72e7131d55353ebd22112a5726354c
Merge "Import translations. DO NOT MERGE" into oc-dev am: 572e338a4c  -s ours
am: d8879e06fa  -s ours

Change-Id: I5321072d0b7ff0df8061496559a0e520a84b4980