OSDN Git Service

am f2f31a63: am 8275abe7: (-s ours) am 5583758a: (-s ours) Merge "Import translations...
authorBaligh Uddin <baligh@google.com>
Mon, 5 Nov 2012 23:50:18 +0000 (15:50 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:50:18 +0000 (15:50 -0800)
* commit 'f2f31a63fbcb97da3ba7140ab4689b5d90bdda84':


Trivial merge