OSDN Git Service

am 2936da9b: (-s ours) am 8c1fe6d3: Import translations. DO NOT MERGE
authorYing Wang <wangying@google.com>
Fri, 13 Jul 2012 19:18:35 +0000 (12:18 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 13 Jul 2012 19:18:35 +0000 (12:18 -0700)
commit6073969496ffb1846aa50c126e0bbb9358b9700b
tree2e83cce2b7ab0d1a9be39011d00e6be5e71013dc
parent74dcb88ab640a2a5a5ec263ee5dbbacd93e8962a
parent2936da9b396a5c2286f61e20fe9f4a21bbc4534d
am 2936da9b: (-s ours) am 8c1fe6d3: Import translations. DO NOT MERGE

* commit '2936da9b396a5c2286f61e20fe9f4a21bbc4534d':
  Import translations. DO NOT MERGE