OSDN Git Service

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c6c0d901bf -s ours
authorBill Yi <byi@google.com>
Fri, 11 Nov 2016 19:20:01 +0000 (19:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 Nov 2016 19:20:01 +0000 (19:20 +0000)
commit7b6a39223bd36a4ea2d836d4e581de009a4da3e5
tree55d3ef145d9df5aa7b832e11f1e4c6ff83fc12b8
parent4a52268e888e0a2282ccfad3bbed4efdad929186
parent8c8e6ef26a521769eb87447ce9ab11f2b5952ac0
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c6c0d901bf  -s ours
am: 8c8e6ef26a  -s ours

Change-Id: I664949ebf418b8d9a8d3a5e80b13caa184ab7df8