OSDN Git Service

am b142c946: (-s ours) am a45cd5a6: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Thu, 5 Dec 2013 21:30:10 +0000 (21:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Dec 2013 21:30:10 +0000 (21:30 +0000)
* commit 'b142c9462f138de363ea1f6c42eaf5884ff2b645':


Trivial merge