No description
Find a file
Mark Salyzyn 1ae7379baa resolve merge conflicts of 7c451a93 to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Bug: 34250038
Change-Id: I4196a6d5a1365106643ac6c1548fd86faffead6f
2017-04-12 09:11:38 -07:00
include/hardware resolve merge conflicts of 7c451a93 to oc-dev-plus-aosp 2017-04-12 09:11:38 -07:00
modules resolve merge conflicts of 7c451a93 to oc-dev-plus-aosp 2017-04-12 09:11:38 -07:00
tests resolve merge conflicts of 7c451a93 to oc-dev-plus-aosp 2017-04-12 09:11:38 -07:00
Android.bp Export headers as libhardware_headers 2017-04-04 14:30:19 -07:00
Android.mk Begin converting Android.mk to Android.bp 2016-07-12 23:34:37 -07:00
CleanSpec.mk Dynamic sensor manager -- implementation of basic sensor daemon 2017-04-07 20:54:18 +00:00
hardware.c Add /odm/lib/hw to HAL search path 2015-11-12 11:24:23 +08:00
MODULE_LICENSE_APACHE2 auto import from //depot/cupcake/@135843 2009-03-03 19:32:14 -08:00
NOTICE auto import from //depot/cupcake/@135843 2009-03-03 19:32:14 -08:00