OSDN Git Service

am c742cfc7: (-s ours) am 6f96fcc5: (-s ours) am 321b25a1: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Tue, 16 Sep 2014 15:21:01 +0000 (15:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 16 Sep 2014 15:21:01 +0000 (15:21 +0000)
* commit 'c742cfc716bba4ee2bd6dbe62a42d182baa4b6bd':
  Import translations. DO NOT MERGE


Trivial merge