OSDN Git Service

am a22aea45: (-s ours) am c75b39e0: Merge change 25609 into eclair
authorEric Fischer <enf@google.com>
Thu, 17 Sep 2009 22:45:46 +0000 (15:45 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Sep 2009 22:45:46 +0000 (15:45 -0700)
commit0c425e071fb64985ab6bdc98dd31c0514da60b14
tree9cd3342397ae76cf3b3df3006339c5a6213d159d
parent12c9872d3b8b0b0b984326725cbbb3dae79af132
parenta22aea45cee7b98df7960f9cb5539f96f62c7f76
am a22aea45: (-s ours) am c75b39e0: Merge change 25609 into eclair

Merge commit 'a22aea45cee7b98df7960f9cb5539f96f62c7f76'

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