Android CTS 6.0 Release 15 (3666707)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAliaGWoACgkQ6K0/gZqxDnhGUwCfQe8pkjsL/X8jTpdnPZmEN3+v
k+EAniHBcFu9CSoAe9gbJ9hKmI3XZPOe
=FuvH
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"