OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 125deebf5d -s ours
authorBill Yi <byi@google.com>
Wed, 2 Nov 2016 13:11:18 +0000 (13:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Nov 2016 13:11:18 +0000 (13:11 +0000)
commit77323eb2bd30b5cef7cb7ef534034515fd503764
tree2e9cd03d54cc966eb50a00fe5ff947094aee0afc
parent70d5453b63782c7a4f480d6e2b2b27d658699da3
parent3b99360472ee2b706d1619696452216ba8a62d36
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 125deebf5d  -s ours
am: 3b99360472  -s ours

Change-Id: I3645f4da4f27625faad83dddb191b16a196aeea7