Android CTS 6.0 Release 21 (4214424)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlmErpgACgkQ6K0/gZqxDnihMgCeLWGaJQWY9akQ1js7kvxhURcL
ew8An2tXLIrRmuREkozi0i3etZ6ngt+Y
=iDBE
-----END PGP SIGNATURE-----
am 4fe49766: Merge "Delete some pointless and invalid code."

* commit '4fe497660c2e939300dc5b743d662aef458b1726':
  Delete some pointless and invalid code.