OSDN Git Service

am 5c20af4c: (-s ours) am 6fa5e627: Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Thu, 23 May 2013 16:32:47 +0000 (09:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 May 2013 16:32:47 +0000 (09:32 -0700)
* commit '5c20af4c7c45e3da2150937d222f85c80b0965b8':
  Import translations. DO NOT MERGE


Trivial merge