OSDN Git Service

am cb6b336e: (-s ours) am 299c6e12: (-s ours) am 9d4dc326: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Wed, 1 Oct 2014 22:30:48 +0000 (22:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 1 Oct 2014 22:30:48 +0000 (22:30 +0000)
* commit 'cb6b336ec2e0d90df9977993d351d372a5ace4d7':
  Import translations. DO NOT MERGE


Trivial merge