Android 2.1 release 2.1s
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQBLsmFx6K0/gZqxDngRAuCiAJ9P/JTiV8FHVUsHZR7uf1F6YPnRkwCgi8xt
XNAh5egEzrIaGDHfGmhdTFs=
=bim6
-----END PGP SIGNATURE-----
Merge donut into master