OSDN Git Service

am 9df440f7: (-s ours) am 0a3cf293: Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Mon, 13 May 2013 16:52:58 +0000 (09:52 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 May 2013 16:52:58 +0000 (09:52 -0700)
* commit '9df440f7edf65b8d7d5be8f307d74cafd672d4b4':
  Import translations. DO NOT MERGE


Trivial merge