tree 95cc64175f0d17495c7776b4efa6450474bdb773
parent d988cb11b57956297beef31a62c02628b0f6430e
parent 25571a94965ce1c92645d30e7052528b7c851d8f
author Pulkit Bhuwalka <pulkitb@google.com> 1487374091 +0000
committer android-build-merger <android-build-merger@google.com> 1487374091 +0000

Merge "Replace hardware features conf file to be emulator specific"
am: 25571a9496

Change-Id: I265f797d72e72f0e0b03d22627a05eff301b1df1