Android 2.0 release 1
Merge branch 'eclair' into eclair-release