OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorBaligh Uddin <baligh@google.com>
Tue, 3 May 2016 23:56:17 +0000 (23:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 3 May 2016 23:56:17 +0000 (23:56 +0000)
commitdd9f819a63f5dfd52f2e6b5c527d7ebc340e685f
tree3f1310308ddcf09de5bf5a1495a79ac0af4962b4
parentb899ded3ae181c3706d607d19ad12f79b942179a
parent582b69a716910df3519677576d97ef6a3773a8a7
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 582b69a716  -s ours

* commit '582b69a716910df3519677576d97ef6a3773a8a7':
  Import translations. DO NOT MERGE

Change-Id: Ibf9bc1b1df398491e3e2f98cab367d6a6951e19d