tree 4e403060344a211ed714971bd09429929ba4ebf4
parent 337feff8b79e1aa8c50ef7d8d15e9076385e136b
author Colin Cross <ccross@android.com> 1487448337 +0000
committer Colin Cross <ccross@android.com> 1487448337 +0000

Revert "Replace hardware features conf file to be emulator specific"

This reverts commit 337feff8b79e1aa8c50ef7d8d15e9076385e136b.

Change-Id: I17323c6053a42f4cc0fbb902cfd101f7783f7e29