OSDN Git Service

am ea34811c: (-s ours) am 55fad05e: Import translations. DO NOT MERGE
authorYing Wang <wangying@google.com>
Fri, 22 Jun 2012 19:30:22 +0000 (12:30 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 Jun 2012 19:30:22 +0000 (12:30 -0700)
* commit 'ea34811c9e7e301c1deba0fedd331101cfe7ce5f':
  Import translations. DO NOT MERGE


Trivial merge