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

iD8DBQBLsmGi6K0/gZqxDngRAnTNAJ9VSung2r0jOmDf6fffXU8A0UjMuACeNv8g
XleVWMX/p3+Gt/3OdWdgzOk=
=akZr
-----END PGP SIGNATURE-----
resolved conflicts for merge of 041c9c26 to eclair
tree: 4b825dc642cb6eb9a060e54bf8d69288fbee4904

This tree is empty.