Android CTS 6.0 Release 24 (4400446)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWfkW/gAKCRDorT+BmrEO
eHOdAJ4pLYPPKZb7/IRL3S5e8aygZW3mmACeN+csQPoQyp6tp+eKmN1AkmEEXmA=
=8maY
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"