Android CTS 6.0 Release 31 (4890202)
-----BEGIN PGP SIGNATURE-----

iFwEABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW3MZUgAKCRDorT+BmrEO
eGnUAJdYdYEofPn0mDe8BHS5qDDv1XEwAJ9SAUMVRRSKm2IlAp3FdsoT2fUMfw==
=cJi0
-----END PGP SIGNATURE-----
am 4fe49766: Merge "Delete some pointless and invalid code."

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