OSDN Git Service

am afc96c1b: (-s ours) am 4e53a0cb: Import translations. DO NOT MERGE
authorYing Wang <wangying@google.com>
Thu, 26 Jul 2012 23:12:50 +0000 (16:12 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 26 Jul 2012 23:12:50 +0000 (16:12 -0700)
commita7bb69228dba715f6b9c7d60599aff2bdb38df4b
tree5023564b0d4befdbfd2055e55fb17f0c2dbe06a9
parentf35b013beb67159301a6c666093a099e655e66f0
parentafc96c1b8798d90477b1725b28f565a484a1d592
am afc96c1b: (-s ours) am 4e53a0cb: Import translations. DO NOT MERGE

* commit 'afc96c1b8798d90477b1725b28f565a484a1d592':
  Import translations. DO NOT MERGE