OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Sat, 22 Jul 2017 17:02:35 +0000 (17:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 17:02:35 +0000 (17:02 +0000)
commit9a048d5b5bafad2f8bbf607d03c7bd6ecb487d7e
treec687fb1ed10c2d9bca3206b7385d2fec5fc70fdc
parenta051d6457549f3049b2306d960607b2f90e9d652
parent27489df3786a30a8da93e2636aabb4abdf0049f4
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 27489df378  -s ours

Change-Id: I910d4fbdc298dfeaab4dd72f65079375a117c71b