tree 95cc64175f0d17495c7776b4efa6450474bdb773
parent d988cb11b57956297beef31a62c02628b0f6430e
parent 7762cee053c7e942e12a5ceceae9f7cc227aedd2
author Pulkit Bhuwalka <pulkitb@google.com> 1487374277 +0000
committer android-build-merger <android-build-merger@google.com> 1487374277 +0000

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

Change-Id: I9f534dda8e0fc540e0feaab38d98f5c18a959b2c