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

iEYEABECAAYFAlldH4cACgkQ6K0/gZqxDnhS1wCfRDiKm0CvqqzMwli0RbEtSTKX
ny8AniKUe+483g+FcJcXfQuK6i7FSyzP
=8Kls
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific""
am: 15314896f3

Change-Id: Ib24338583e6cfd282ee7d57cab07e55adabbad16