Android 7.0.0 release 31
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAli9mNAACgkQ6K0/gZqxDniA9gCfZkPzTsYza0oAXzDQ3kr3sTMH
Z0oAnjEv321JZYDGWQQRl58H8xmtVQKJ
=+TIV
-----END PGP SIGNATURE-----
GCMParameters: in ASN1 encoding, use 12 when no value is specified

This reverts commit 4d0e19131da68053fe1a73d43052bedadb107c70

Bug: 26231099
Bug: 26234568
Bug: 29876633
Change-Id: I44c0c68f1e92caf6547c9e3b494ec5b82b8cff5f
(cherry picked from commit 48c093f131532fc163625304c60d0a8d07689327)
1 file changed