OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorBill Yi <byi@google.com>
Mon, 25 Apr 2016 15:15:34 +0000 (15:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 15:15:34 +0000 (15:15 +0000)
commitdad715bd91156ff688aa3ce1b9711fbf618306f2
tree0b9572b2652b5fd0812ec62262bdb10bf5bcb400
parentd928ad61e87ce8ecc1a7edae26bced459c923859
parentc8ad9db8b0ce8d8a3301b96ba00f91af369fe38e
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: c8ad9db  -s ours

* commit 'c8ad9db8b0ce8d8a3301b96ba00f91af369fe38e':
  Import translations. DO NOT MERGE

Change-Id: Id5466e6df122f2630d1e5a7fdcad1e63660ffaf4