Android CTS 6.0 Release 12 (3417974)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlgaJ5IACgkQ6K0/gZqxDniXkwCfWAZew2Njx9bepDBdi3z1C+Aw
LF0Ani3zMf0xYsfCPJA0ko50TiJ4M1cM
=igR3
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"