Android 6.0.1 release 24
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlcDBbYACgkQ6K0/gZqxDng7JQCfa8Gfi73boBetqufMS114P8z2
18EAnRXHkEXf8dwEwbAb8MX8b+mD6NK7
=XP/h
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"