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

iEYEABECAAYFAlauNtYACgkQ6K0/gZqxDnif3gCfbkJ0Vfvxu5A8uwip1T/WcCg5
66oAnjIADWgn7nMmLaekK+OhVoPKRPvI
=RHnA
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"