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

iEYEABECAAYFAk6EmggACgkQ6K0/gZqxDnhvKACfRJF5n5w+qSMxP03c7C0P3Jj9
RjoAn0PpC5DDANiETRWRkF2YfK7Fer7s
=aljp
-----END PGP SIGNATURE-----
merge from open-source master

Change-Id: I28be55e2d649c8d52ad7ed47c5a19221a886ae7b