tree 4e403060344a211ed714971bd09429929ba4ebf4
parent 7762cee053c7e942e12a5ceceae9f7cc227aedd2
parent 15314896f3fae5a287fa61933718d58fbd44969f
author Colin Cross <ccross@android.com> 1487719883 +0000
committer android-build-merger <android-build-merger@google.com> 1487719883 +0000

Merge "Revert "Replace hardware features conf file to be emulator specific""
am: 15314896f3

Change-Id: Ib24338583e6cfd282ee7d57cab07e55adabbad16