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

iEYEABECAAYFAlbd4TQACgkQ6K0/gZqxDngsHACcCkGb5zOLQ/HW6Tn1ur8yWt5T
vsUAn2hOCcnU5f14vOv3SO7TiVBFOLxr
=jCOK
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"