OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 2de9313 -s ours
authorBill Yi <byi@google.com>
Wed, 6 Apr 2016 17:31:40 +0000 (17:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Apr 2016 17:31:40 +0000 (17:31 +0000)
commit2dc87ed5d6ff401e267aae200013f7c133f8a550
tree95c8faaa7f468db9c33b2e2d75beddbd9df6352c
parentfe78760b3d4a4dc723eb8edc99a6b5bdf49a0a56
parent5a979a6fd5b7ae333c40ce73cb14da167edad3de
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 2de9313  -s ours
am: 5a979a6  -s ours

* commit '5a979a6fd5b7ae333c40ce73cb14da167edad3de':
  Import translations. DO NOT MERGE

Change-Id: Ia7e9646dcc3fa744b596181f74e99b053fd9d2a4