OSDN Git Service

am 91840c02: (-s ours) am d7ae05db: Import translations. DO NOT MERGE
authorYing Wang <wangying@google.com>
Wed, 1 Aug 2012 22:30:23 +0000 (15:30 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 1 Aug 2012 22:30:23 +0000 (15:30 -0700)
commit6a20ce5e515141b0934bd4093dbad53c14a19a6e
tree6dc1b4d73be3576e93c511131101500d25b44a44
parent4c9e26b0d2ebee28027de0703fbdc9195166ba72
parent91840c02361af8157b0c0395fafe704edab2e498
am 91840c02: (-s ours) am d7ae05db: Import translations. DO NOT MERGE

* commit '91840c02361af8157b0c0395fafe704edab2e498':
  Import translations. DO NOT MERGE