OSDN Git Service

am 0a837485: am bdae7b01: (-s ours) am 3eee86b8: Import translations. DO NOT MERGE
authorYing Wang <wangying@google.com>
Fri, 3 Aug 2012 21:44:07 +0000 (14:44 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 3 Aug 2012 21:44:07 +0000 (14:44 -0700)
commit010a775e5120a86d8495806ccde3db11948831ee
tree727c3409a8497c0db2bc9e5a04399edccbfe0485
parentede6fa43b782bc256ab71e8ce39c397d4b087c5d
parent0a837485800aa38a2c6832c98c6dc09ee22c9047
am 0a837485: am bdae7b01: (-s ours) am 3eee86b8: Import translations. DO NOT MERGE

* commit '0a837485800aa38a2c6832c98c6dc09ee22c9047':
  Import translations. DO NOT MERGE