OSDN Git Service

am 476e0045: (-s ours) am 7c4a9e55: (-s ours) am 37749ea3: (-s ours) Import translati...
authorBaligh Uddin <baligh@google.com>
Thu, 23 Oct 2014 17:32:35 +0000 (17:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Oct 2014 17:32:35 +0000 (17:32 +0000)
* commit '476e00451968fe0388e943e83d3895298031cd09':


Trivial merge