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

iEYEABECAAYFAlcC/ksACgkQ6K0/gZqxDngoNACfT/oAAY+4qpIpEbrVckkCXW1U
y7gAnA+jLkaGGvlPyddTp5WD09jsfXvE
=WeXD
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"