tree c4447cb1db05010377f6bc59f72fb2c0738b1583
parent cc9b3cabf4066b55a7b8dabe59cdd6d6351eb74e
parent c944e58943ea6e07ac558c3e9da7567a87eaf660
author The Android Open Source Project <initial-contribution@android.com> 1265408384 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265408384 -0800

am c944e589: am fbe53add: reconcile main tree with open-source eclair

Merge commit 'c944e58943ea6e07ac558c3e9da7567a87eaf660'

* commit 'c944e58943ea6e07ac558c3e9da7567a87eaf660':
  android-2.1_r1 snapshot