Yuexi Ma 8ef11932b9 resolve merge conflicts of 07ff5f4376 to pi-dev-plus-aosp ... Test: I solemnly swear I tested this conflict resolution. Change-Id: Id636c3171bffffeaf7a30a7912c38796e5a4c780		2018-03-26 16:05:07 -07:00
..
default	Define new AudioControl HAL for automotive.	2018-01-10 11:50:17 -08:00
vts/functional	Update vts test module bp files to use VtsHalTargetTestDefaults	2018-03-22 23:36:10 +00:00
Android.bp	Updating makefiles for hidl_interface.	2017-12-03 10:31:49 -08:00
IEvsCamera.hal	Simplify EVS HAL and move to "agressive opens"	2017-03-30 14:04:12 -07:00
IEvsCameraStream.hal	Move EVS HAL under automotive folder	2017-03-06 15:59:50 -08:00
IEvsDisplay.hal	Simplify EVS HAL and move to "agressive opens"	2017-03-30 14:04:12 -07:00
IEvsEnumerator.hal	Fix typos in IEvsEnumerator descriptive comment	2017-05-22 16:58:15 -07:00
types.hal	Simplify EVS HAL and move to "agressive opens"	2017-03-30 14:04:12 -07:00