tree c26fd97688a86a1adeaaee996f9b0ba97f500a0b
parent 08d10a44f653c0f986a104f0098326daab4bc5ee
author Colin Cross <ccross@android.com> 1487448337 +0000
committer Colin Cross <ccross@android.com> 1487453763 -0800

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

This reverts commit 337feff8b79e1aa8c50ef7d8d15e9076385e136b.

Change-Id: I17323c6053a42f4cc0fbb902cfd101f7783f7e29