OSDN Git Service

am fb088ffc: (-s ours) am b847f5c6: (-s ours) Merge change I3a308bca into eclair
authorEric Fischer <enf@google.com>
Fri, 13 Nov 2009 19:32:51 +0000 (11:32 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 13 Nov 2009 19:32:51 +0000 (11:32 -0800)
commitf775ea1dc9c337cd9a0c9252f281126636c51160
tree79388ee066788a16535f61b7fc9e380fe98c87e5
parent70ebeb824d61ccc8bbc10bf561a14afef019a409
parentfb088ffce4289ff5658d59f0a6f7ed5b2c601aa8
am fb088ffc: (-s ours) am b847f5c6: (-s ours) Merge change I3a308bca into eclair

Merge commit 'fb088ffce4289ff5658d59f0a6f7ed5b2c601aa8'

* commit 'fb088ffce4289ff5658d59f0a6f7ed5b2c601aa8':
  Import revised translations.  DO NOT MERGE