Android CTS 6.0 Release 31 (4890202)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW3MZbAAKCRDorT+BmrEO
eCvdAJ45VE6e2Xsf7a+u/0tRlkgoD6uV2ACeNIYbo7OZZ2RSM/gmGSp2D+NIY8M=
=WyDN
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"