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

iD4DBQBLsmF36K0/gZqxDngRAiNBAJdVXWgF97ZVdiKSaYbGfOKT0OuaAJ9aXcuI
LtpDqkFujZWSipu1mVuM3w==
=13gu
-----END PGP SIGNATURE-----
reconcile korg/master into goog/master