OSDN Git Service

am 2e1d2ed6: (-s ours) am 91bceebd: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Mon, 27 Oct 2014 05:36:49 +0000 (05:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Oct 2014 05:36:49 +0000 (05:36 +0000)
* commit '2e1d2ed664bf9a0b91424d19d158f1ea2b58c8fd':


Trivial merge