OSDN Git Service

am cae7ce93: (-s ours) am 18a53ab1: (-s ours) am 13157532: (-s ours) am 2ea40009...
authorBaligh Uddin <baligh@google.com>
Sun, 6 Jul 2014 21:49:32 +0000 (21:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 6 Jul 2014 21:49:32 +0000 (21:49 +0000)
* commit 'cae7ce93a49d5702cb5738148df18f43e3d6aa21':
  Import translations. DO NOT MERGE


Trivial merge