Android CTS 6.0 Release 25 (4485418)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWlVvrwAKCRDorT+BmrEO
eB8nAJ9r6JwgUWTE2TLx3FIfaz+0CZS4GQCeLf1TAH5jygkZUGYr6wPgAD7x/Og=
=w4XC
-----END PGP SIGNATURE-----
am 4fe49766: Merge "Delete some pointless and invalid code."

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