OSDN Git Service

am a7bb6922: am afc96c1b: (-s ours) am 4e53a0cb: Import translations. DO NOT MERGE
authorYing Wang <wangying@google.com>
Thu, 26 Jul 2012 23:15:22 +0000 (16:15 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 26 Jul 2012 23:15:22 +0000 (16:15 -0700)
* commit 'a7bb69228dba715f6b9c7d60599aff2bdb38df4b':
  Import translations. DO NOT MERGE


Trivial merge