OSDN Git Service

am ed035ad1: am adfcb006: am 1cf344e2: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Mon, 5 Nov 2012 23:53:48 +0000 (15:53 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:53:48 +0000 (15:53 -0800)
* commit 'ed035ad14569dd55234026f816e61089a077b0c5':


Trivial merge