tree 4e403060344a211ed714971bd09429929ba4ebf4
parent 25571a94965ce1c92645d30e7052528b7c851d8f
parent a328fdd779b01817134cbbe990a82eab61bbe5d1
author Colin Cross <ccross@android.com> 1487719505 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1487719507 +0000

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