sqian 1809f03213 Fix Merge conflict CL ...

- add a hash that is added in the oc-dev

Test: Treehugger
Bug: 65230472
Change-Id: Ifa99cde4aa30e53567ee744151f483de4e0739c9

2017-11-14 22:27:56 +00:00

audio

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

automotive

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

biometrics

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

bluetooth

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

boot

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

broadcastradio

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

camera

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

cas

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

configstore

Merge "Fix library loading order in .mk files."

2017-11-13 20:40:38 +00:00

contexthub

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

drm

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

dumpstate

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

gatekeeper

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

gnss

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

graphics

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

health

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

ir

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

keymaster

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

light

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

media

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

memtrack

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

neuralnetworks

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

nfc

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

oemlock

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

power

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

radio

Modify VTS error check so that the error code can be displayed

2017-11-13 15:16:04 -08:00

renderscript

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

sensors

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

soundtrigger

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

tests

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

tetheroffload

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

thermal

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

tv

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

usb

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

vibrator

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

vr

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

weaver

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

wifi

Merge "Fix library loading order in .mk files."

2017-11-13 20:40:38 +00:00

.clang-format

.clang-format: 100 lines

2017-05-02 16:45:27 -07:00

Android.bp

Updating makefiles for hidl_interface.

2017-11-13 10:00:18 -08:00

CleanSpec.mk

Replace OUT with OUT_DIR

2017-11-09 22:58:09 +00:00

compatibility_matrix.26.xml

fwk compat mat: add health@2.0

2017-11-07 15:32:31 -08:00

compatibility_matrix.27.xml

fwk compat mat: add health@2.0

2017-11-07 15:32:31 -08:00

compatibility_matrix.current.xml

fwk comp mat: deprecate health@1.0

2017-11-13 20:31:35 +00:00

compatibility_matrix.legacy.xml

fwk compat mat: add health@2.0

2017-11-07 15:32:31 -08:00

current.txt

Fix Merge conflict CL

2017-11-14 22:27:56 +00:00

MODULE_LICENSE_APACHE2

Apache2 module license.

2016-08-30 11:28:36 -07:00

NOTICE

Apache2 module license.

2016-08-30 11:28:36 -07:00

OWNERS

Add OWNERS in hardware/interfaces

2017-06-12 13:20:12 -07:00

PREUPLOAD.cfg

Enable the clang-format pre-submit hook

2017-03-30 13:26:49 -07:00

update-base-files.sh

Update base files script works anywhere.

2017-09-25 18:43:27 -07:00

update-makefiles.sh

Update makefiles from anywhere.

2017-05-11 15:42:32 -07:00

Description

No description provided

134 MiB

Languages

C++ 56.3%

AIDL 41.2%

C 1.5%

Rust 0.4%

Java 0.4%

Other 0.1%