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

iEYEABECAAYFAlYxAdgACgkQ6K0/gZqxDniRfwCfX3pX1gA7JZlna3JP0xoraY/C
x1AAn01rJSXmoRj9x35CJ+lzOHn1F5wJ
=wChM
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"