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)
commit6eb937b9e9a6f9895a22a1e76a1b9aa545dd01bc
tree112d97c3acc805f7d1fa694d10e6f597f1a92bd8
parent3c5354bbf77d7c6cac299431a0895b1aead34cc9
parent5c20af4c7c45e3da2150937d222f85c80b0965b8
am 5c20af4c: (-s ours) am 6fa5e627: Import translations. DO NOT MERGE

* commit '5c20af4c7c45e3da2150937d222f85c80b0965b8':
  Import translations. DO NOT MERGE