OSDN Git Service

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7ba7f49030 -s ours am...
authorBill Yi <byi@google.com>
Wed, 2 Nov 2016 13:21:09 +0000 (13:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Nov 2016 13:21:09 +0000 (13:21 +0000)
commit96998628421e86e0a82ec778cbf2862b5368f98c
tree5e416d26a3d3f7a42eec8d0923fc854184e32f26
parent6ab02aad7d0c7d55f4ada9041bbfac8af0f209c1
parentc850e6cdac42dcacc12c3951d880798449bd9e99
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7ba7f49030  -s ours am: 80914e10e5  -s ours
am: c850e6cdac  -s ours

Change-Id: I8e4922f0d2a04054a8d163ffa2888e129f803fcc