OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Wed, 30 Aug 2017 22:11:11 +0000 (22:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 30 Aug 2017 22:11:11 +0000 (22:11 +0000)
commitb3240c2bb08790abeb78ee777f1929739de22dc2
treed4abbb535c624b6cb1806d82e550a274a94d6c58
parent9e963e77bd414c28b5c9c22cce9e7bc086101efe
parentd9abde75e843a0486d5f3c5f5488cb01bde9fc73
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: d9abde75e8  -s ours

Change-Id: Ie47998650cb3304201d7cedac9d5cea1015c14eb