tree 810f3a7e9b99802d7d25352bbe732bcec1e4af39
parent 5bcf3068f787ec850de0e142d2b1b7cb6aacf42d
parent c9d69d6c7925285a0cdbf7061961ffb172e34bbf
author Pulkit Bhuwalka <pulkitb@google.com> 1487398889 +0000
committer android-build-merger <android-build-merger@google.com> 1487398889 +0000

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

Change-Id: Ifa3ecb1b911be2a80c197c9636fa9b8125ed86cd