OSDN Git Service

am 1d0c107a: (-s ours) am 527e80b4: am 77f3d897: (-s ours) Merge change I1afe6674...
authorEric Fischer <enf@google.com>
Wed, 2 Dec 2009 01:40:12 +0000 (17:40 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Dec 2009 01:40:12 +0000 (17:40 -0800)
commit688871a280f978274d23f2dd21bcee08a7488e59
tree7188ccfc2d6aeb21ec4c21065e9415145e0d0451
parent73363b3a4cf2a248222de5a07a938da868c79392
parent1d0c107a170d54bad76e477b5428f25a7217b9b8
am 1d0c107a: (-s ours) am 527e80b4: am 77f3d897: (-s ours) Merge change I1afe6674 into eclair

Merge commit '1d0c107a170d54bad76e477b5428f25a7217b9b8'

* commit '1d0c107a170d54bad76e477b5428f25a7217b9b8':
  Import revised translations.  DO NOT MERGE