tree 3f50c011ce0aa981efebfa94d0bd7499eac81623
parent 70aac88a616d935ea1d7642a984b0dc17ecf0b7d
parent efa6ae84ca235919249e3c75003450605e485beb
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""