OSDN Git Service

am bf29cbbc: (-s ours) am 28e21fb4: (-s ours) am 4c60be5b: (-s ours) am 7aa56efd...
authorBaligh Uddin <baligh@google.com>
Thu, 26 Dec 2013 23:54:49 +0000 (23:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 26 Dec 2013 23:54:49 +0000 (23:54 +0000)
* commit 'bf29cbbc1df534dcf2f8553c70920b7cc056e76c':
  Import translations. DO NOT MERGE


Trivial merge