Steven Moreland 7d4d1c2156 resolve merge conflicts of d3b6ea09c1 to pi-dev-plus-aosp ... BUG: None Test: I solemnly swear I tested this conflict resolution. Change-Id: I669dfde4a23d8d995232dfbf6b57745532ff76f2		2018-05-07 13:31:59 -07:00
..
default	resolve merge conflicts of d3b6ea09c1 to pi-dev-plus-aosp	2018-05-07 13:31:59 -07:00
vts/functional	Merge "Convert dumpstate hal test to use VtsHalHidlTargetTestEnvBase" am: 250d67a157 am: 12b8312acf	2018-02-09 17:51:14 +00:00
Android.bp	Updating makefiles for hidl_interface.	2017-11-13 10:00:18 -08:00
IDumpstateDevice.hal	Update hash and VTS for the 2nd FD of dumpstate	2017-06-20 09:58:13 -07:00