Android CTS 7.0 Release 21 (4723847)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWvnQrAAKCRDorT+BmrEO
eCBWAKCQIfpH4X5xuwsxgQGErzMsWjIEAACffkPrYBloxYKN15AG20VQP/wr1RU=
=8Tv3
-----END PGP SIGNATURE-----
merge in nyc-release history after reset to master