OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
authorBill Yi <byi@google.com>
Thu, 30 Nov 2017 21:47:29 +0000 (21:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 Nov 2017 21:47:29 +0000 (21:47 +0000)
commit0911a97fc276f074fdbe8747f054ed9a77d02c99
tree62d787e248df0cf368e0546c1926f772c2fe0f99
parentae57527637d08aa641e66a86201efc57cb2dbf31
parentc168312e92574e8955c6a9ec2f2cf9e7ed732c7b
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: c168312e92  -s ours

Change-Id: Iaf3798c24777e711a4b8b9545b2fde655046811b