Android CTS 5.1 Release 21 (4114473)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlldRJQACgkQ6K0/gZqxDnisgQCgj8ctdkfQfP552dsMZqvDAv2C
1MsAnj8b64pn1ij2zBdv2xkN9be7xjNy
=Up85
-----END PGP SIGNATURE-----
Merge "DO NOT MERGE Fix test_getZoneStrings_GMT_short_names" into lollipop-mr1-cts-dev