OSDN Git Service

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


Trivial merge