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)
commit05675b78ca4ff3a100dcf4797d0e85a92fb8d431
tree8aad6ea0dda80be0a6fe62c63da88686c400428e
parent187c1d48221dc8c51a9eaa173c34e841f31bc123
parentc8ad9db8b0ce8d8a3301b96ba00f91af369fe38e
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: c8ad9db  -s ours

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

Change-Id: I66dc9779637507b466e97126a6607229e5c11e66