Android CTS 6.0 Release 18 (3942491)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlkJEjMACgkQ6K0/gZqxDniUogCZAeJFvE7UL+pfoIuK1JlC17UE
+vMAnjJH5Uqs8jua0zBqmmH0E4YnpXUw
=n9Tp
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"