OSDN Git Service

am 6a20ce5e: am 91840c02: (-s ours) am d7ae05db: Import translations. DO NOT MERGE
authorYing Wang <wangying@google.com>
Wed, 1 Aug 2012 22:34:00 +0000 (15:34 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 1 Aug 2012 22:34:00 +0000 (15:34 -0700)
* commit '6a20ce5e515141b0934bd4093dbad53c14a19a6e':
  Import translations. DO NOT MERGE


Trivial merge