Android 2.3 CTS release 12
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEABECAAYFAk9Pq1AACgkQ6K0/gZqxDngFMQCePw1Dbmv3E1GpFDs3nZYCt4/1
DqAAnj2cPuq/RIpJ4+dbbLeRnx8Xw5vY
=9uZ+
-----END PGP SIGNATURE-----
merge from open-source master

Change-Id: I28be55e2d649c8d52ad7ed47c5a19221a886ae7b