OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Tue, 31 May 2016 04:52:04 +0000 (04:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 31 May 2016 04:52:04 +0000 (04:52 +0000)
commit54ce05d3e373e7cc6d5b4b0f6a19de0c9e3c0728
tree59895c319312ebb341196638ed876453332e8fb0
parente2bc59b04533f0c04599aecd21fb092141b33cf6
parent442628a22693286cc1f96e1b1fbd8743f9eedea7
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 442628a226  -s ours

* commit '442628a22693286cc1f96e1b1fbd8743f9eedea7':
  Import translations. DO NOT MERGE

Change-Id: I63a36d6c9a94f27f75adfdc84d2920c55fba2f33