OSDN Git Service

Merge "Import translations. DO NOT MERGE" into cw-f-dev
authorBill Yi <byi@google.com>
Wed, 2 Nov 2016 13:04:36 +0000 (13:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Nov 2016 13:04:36 +0000 (13:04 +0000)
commit80914e10e5466914c836b4aef746e33553b301b2
tree2e9cd03d54cc966eb50a00fe5ff947094aee0afc
parent9e7ac87d08ccc93d9e8304869dc73c74465d801f
parent7ba7f4903082b13a2abf0566ce30d7b894a3aa7b
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 7ba7f49030  -s ours

Change-Id: I2786876548e79632ff8aae52cd058ba4eaa57895