Android n-iot-release-smart-display (NIT1.180611.004)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW1tSkQAKCRDorT+BmrEO
eNlrAJwNue3rBix1tgTXy7pPAXy3indyhQCeOpycAN31tcaGRbT7mESvBlg7knc=
=gV0S
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58