OSDN Git Service

am 9eff1426: (-s ours) am 5fe0d63f: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Mon, 27 Oct 2014 18:49:56 +0000 (18:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Oct 2014 18:49:56 +0000 (18:49 +0000)
* commit '9eff142638f0dbfd92a304785d3be59886b93309':


Trivial merge