OSDN Git Service

am 617918d6: (-s ours) Import translations. DO NOT MERGE automerge: ad3b94f -s ours
authorBaligh Uddin <baligh@google.com>
Tue, 30 Dec 2014 12:14:28 +0000 (12:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 30 Dec 2014 12:14:28 +0000 (12:14 +0000)
* commit '617918d61b3023d2f6910b4097ea1b772612372c':
  Import translations. DO NOT MERGE


Trivial merge