OSDN Git Service

am 1cef81ac: (-s ours) am d5017721: am e6319953: am caace51d: (-s ours) Import transl...
authorBaligh Uddin <baligh@google.com>
Mon, 5 Nov 2012 23:56:15 +0000 (15:56 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:56:15 +0000 (15:56 -0800)
* commit '1cef81acf93c6ac3c43f8bbac45ab7048ff4c878':


Trivial merge