OSDN Git Service

am acbd8195: (-s ours) am 2bfd4a5f: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Sun, 21 Sep 2014 18:30:33 +0000 (18:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 21 Sep 2014 18:30:33 +0000 (18:30 +0000)
* commit 'acbd8195002b4f5315f5de907149c2084626e28b':
  Import translations. DO NOT MERGE


Trivial merge