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

iEYEABECAAYFAk06GrYACgkQ6K0/gZqxDnh3xACfcpYnBP6fik4mcHvcUWtpjbzV
wHQAn0VYj+M/DyA6756rhxvjMJB/EWoZ
=WKRk
-----END PGP SIGNATURE-----
merge from open-source master

Change-Id: I28be55e2d649c8d52ad7ed47c5a19221a886ae7b