OSDN Git Service

am 90155f6d: (-s ours) am 7558467a: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Fri, 15 May 2015 17:11:32 +0000 (17:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 May 2015 17:11:32 +0000 (17:11 +0000)
* commit '90155f6d0bc0cc80b7b027ee62ebf1013c9cd149':


Trivial merge