OSDN Git Service

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


Trivial merge