OSDN Git Service

am 12055197: (-s ours) am ef0fa0e7: (-s ours) am fbbc8f1e: (-s ours) am 58305fc4...
authorBaligh Uddin <baligh@google.com>
Wed, 17 Sep 2014 05:11:43 +0000 (05:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 17 Sep 2014 05:11:43 +0000 (05:11 +0000)
* commit '120551971e838cc51ef78bb3d724296cd9fbb6aa':
  Import translations. DO NOT MERGE


Trivial merge