OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: a3bdce963f -s ours...
authorBill Yi <byi@google.com>
Wed, 2 Aug 2017 22:21:53 +0000 (22:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Aug 2017 22:21:53 +0000 (22:21 +0000)
commitfb1c973621447d1a62c5291e4c26b5b38c71d460
tree70ba53f4fe7374a9d8833b8d17b6fc7a001ea896
parentd9c14efd16df85ce627f383dae8689d0e7a2488e
parent97d8360fc5c2be88ce0651a10a699604dceb6a04
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: a3bdce963f  -s ours am: 52498c1da9  -s ours
am: 97d8360fc5  -s ours

Change-Id: Id3cabaf31bf2ff3954de71071380c4b6c23a8374