OSDN Git Service

am ca2ae438: (-s ours) am 3e48bde0: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Sun, 5 Oct 2014 17:47:52 +0000 (17:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 5 Oct 2014 17:47:52 +0000 (17:47 +0000)
* commit 'ca2ae438461c7ff80203da6c2a8f83f7be208cb7':
  Import translations. DO NOT MERGE


Trivial merge