OSDN Git Service

am e17335e9: (-s ours) am 3b10f0ba: Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Tue, 11 Dec 2012 05:14:49 +0000 (21:14 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 11 Dec 2012 05:14:49 +0000 (21:14 -0800)
* commit 'e17335e98267b856822499315b9a66aacf1c2f69':
  Import translations. DO NOT MERGE


Trivial merge