OSDN Git Service

am 31920dae: (-s ours) am f6f93cfe: Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Mon, 6 May 2013 23:20:50 +0000 (16:20 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 6 May 2013 23:20:50 +0000 (16:20 -0700)
commit6865e66b33db54feb93ac8a910cd0f2dc426b1e2
tree7c206fb35049fb5be574c5058524033d673b9ff8
parentcf9a92a79fca5d6226e37d76e2f1c23238c072af
parent31920daec9d919c83f88e12002914fcef48882da
am 31920dae: (-s ours) am f6f93cfe: Import translations. DO NOT MERGE

* commit '31920daec9d919c83f88e12002914fcef48882da':
  Import translations. DO NOT MERGE