OSDN Git Service

am 7ff805ac: am 577c826a: am 9a21fba3: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Mon, 29 Apr 2013 18:22:00 +0000 (11:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 29 Apr 2013 18:22:00 +0000 (11:22 -0700)
* commit '7ff805ac933c074e148fb107c7aa548cce1e39d5':
  Import translations. DO NOT MERGE


Trivial merge