Android CTS 6.0 Release 8 (3046108)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAleFZ4IACgkQ6K0/gZqxDnjjMwCfa9N8Ilz4zQjL+ZpYwCSraFTD
WOgAn2mn/84c1BM/ZCaFpKolMTzk2h8w
=umri
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"