Android 2.3.1 release 1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEABECAAYFAk0SU6cACgkQ6K0/gZqxDniv8gCcClQq/nht/78YBsBMT8sWJI9A
ChgAn3pbm8czl4fVssH7GWWktbHCPf58
=HVKI
-----END PGP SIGNATURE-----
merge from open-source master

Change-Id: I28be55e2d649c8d52ad7ed47c5a19221a886ae7b