OSDN Git Service

am adcf72ab: (-s ours) am bbf9927b: (-s ours) am 43848de1: (-s ours) Import translati...
authorBaligh Uddin <baligh@google.com>
Mon, 27 Oct 2014 20:38:52 +0000 (20:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Oct 2014 20:38:52 +0000 (20:38 +0000)
* commit 'adcf72abda4c2595110838fd1dfee83b65ea47e6':


Trivial merge