OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Sat, 3 Jun 2017 21:56:45 +0000 (21:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 3 Jun 2017 21:56:45 +0000 (21:56 +0000)
commitfb5fdf1012ca76dcf02a890c744450975dbb2375
treeba9993b40645a0f1ca791b2421d7abc9e1f5c158
parentf6ee9682f897d966b63ea39bee6514154e13eef5
parent5228e5d0cb0e23828e37cd9d8c237f8c97c72c26
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 5228e5d0cb  -s ours

Change-Id: Iba14cc0d0ef8dfb745b946d9504e261a6ab2f519