OSDN Git Service

am 295c2453: (-s ours) am 6dd67099: Import translations. DO NOT MERGE
authorYing Wang <wangying@google.com>
Tue, 12 Jun 2012 20:15:22 +0000 (13:15 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 12 Jun 2012 20:15:22 +0000 (13:15 -0700)
commit103c5b04d678212a25d52301d0b4062b93f9e945
tree6d3d58f000829f646c384566054b72c8fe28be42
parent5bced1b7da3a1d3e8ad7e93e641467f30db40874
parent295c2453f820709b8aa2a431940af1020d2de585
am 295c2453: (-s ours) am 6dd67099: Import translations. DO NOT MERGE

* commit '295c2453f820709b8aa2a431940af1020d2de585':
  Import translations. DO NOT MERGE