OSDN Git Service

am af05f177: (-s ours) am e3eb601d: Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Tue, 30 Apr 2013 23:45:50 +0000 (16:45 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 30 Apr 2013 23:45:50 +0000 (16:45 -0700)
* commit 'af05f177f2fb866a8cef4278d383e321a8491855':
  Import translations. DO NOT MERGE


Trivial merge