tree 4e403060344a211ed714971bd09429929ba4ebf4
parent c9d69d6c7925285a0cdbf7061961ffb172e34bbf
parent dd168c481dcb14c7932c7026ac7c8b4af128e4a5
author Colin Cross <ccross@android.com> 1487720154 +0000
committer android-build-merger <android-build-merger@google.com> 1487720154 +0000

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

Change-Id: I32933296c35d8251df0ca24c48ca7a05fa72cda1