OSDN Git Service

am e6319953: am caace51d: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Mon, 5 Nov 2012 23:48:43 +0000 (15:48 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:48:43 +0000 (15:48 -0800)
* commit 'e6319953a3b2d11251b57bfb6cd2a5e0ffbb552d':


Trivial merge