OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 29 Sep 2016 07:48:48 +0000 (07:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Sep 2016 07:48:48 +0000 (07:48 +0000)
commitc53fb015d9292e034f50a2b1e15d5eda62b8c35c
treed3b09faeba56f16f2518bd082a2a7ff9cd58aff6
parentae3ec3984dd1ad5687ea4351a8bc3f2b3b472960
parentf497c48345041f0d8f738971bad4a48985f39d0a
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: f497c48345  -s ours

Change-Id: Ie7d6c6f9bbe4af3ca3709c1557dde5e52eeb91bc