OSDN Git Service

am 7581a68b: (-s ours) am eb3c86d7: (-s ours) Merge change I08582aef into eclair
authorEric Fischer <enf@google.com>
Mon, 12 Oct 2009 18:12:53 +0000 (11:12 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Oct 2009 18:12:53 +0000 (11:12 -0700)
commit60114bc901924c0c5bc38bd5cf8cc9d5e29ea34b
tree4ffe88c036789364e4068985301d298bcefa5122
parentaa1e2df670171d17fd9b19331bcfc5d96b80da29
parent7581a68be376b442a12cbcd326e861e8d02cb6de
am 7581a68b: (-s ours) am eb3c86d7: (-s ours) Merge change I08582aef into eclair

Merge commit '7581a68be376b442a12cbcd326e861e8d02cb6de'

* commit '7581a68be376b442a12cbcd326e861e8d02cb6de':
  Import revised translations.  DO NOT MERGE