OSDN Git Service

am ba0bccbf: (-s ours) am 72b2f85f: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Fri, 25 Jul 2014 16:58:08 +0000 (16:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 25 Jul 2014 16:58:08 +0000 (16:58 +0000)
* commit 'ba0bccbf9124f5d6662c1421ceb965800309ffb8':


Trivial merge