Android o preview 2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlkjLBgACgkQ6K0/gZqxDnjISwCfQSrRB4AS5WQMTjftAyIgbSw+
WroAni1CRbKRL61qneQEtq8rj4k2li/w
=i/Vm
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific""
am: 15314896f3

Change-Id: Ib24338583e6cfd282ee7d57cab07e55adabbad16