OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: 6b1ff7073a -s ours
authorBill Yi <byi@google.com>
Fri, 23 Jun 2017 13:00:52 +0000 (13:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Jun 2017 13:00:52 +0000 (13:00 +0000)
commita043cf04df8a4e18d21c5d09d10dab9d3bd58386
tree3d8cc9cd2493904e4ae43551114f1625bb939a50
parent995b3898c43483b35837cc338fe022b5d8ea3c4d
parentbbeaae705d6dbf7eabcaede30bc118cbc9592280
Merge "Import translations. DO NOT MERGE" into oc-dev am: 6b1ff7073a  -s ours
am: bbeaae705d  -s ours

Change-Id: I2125118b568ea7d81b37a7c944d6c16d75742824