OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f497c48345 -s ours...
authorBill Yi <byi@google.com>
Thu, 29 Sep 2016 08:07:04 +0000 (08:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Sep 2016 08:07:04 +0000 (08:07 +0000)
commitbe08ed16e9e42012ca6e06529da56379d752bde3
tree248d275872cde6c1b735f094a1ac88bde3d403bf
parenta53a20eb4b8c1f7619e401a87346621874ad4f5a
parent1ed1b99ad039172dfffa8d825e4d1e84b1ccd9b7
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f497c48345  -s ours am: c53fb015d9  -s ours
am: 1ed1b99ad0  -s ours

Change-Id: If291c9d8e93d276a683a0f389ee497a7b7801eed