OSDN Git Service

am 5428f346: (-s ours) am b1b8b9d8: am 5ac0bdab: (-s ours) Merge "Import translations...
authorBaligh Uddin <baligh@google.com>
Tue, 30 Oct 2012 00:16:00 +0000 (17:16 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 30 Oct 2012 00:16:00 +0000 (17:16 -0700)
* commit '5428f3463dbf74873413bd2a8ed1199e78a4a0fe':
  Import translations. DO NOT MERGE


Trivial merge