sqian 4e49d8d43b resolve merge conflicts of 0e50326a to oc-dev-plus-aosp ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I91fb2abbee5db431e8dc5dbfc8fc9fe0b9179b0c

2017-05-31 15:27:25 -07:00

audio

Merge "Temporary disable tests failing tests for O" into oc-dev

2017-05-23 21:48:04 +00:00

automotive

Merge "Fix typos in IEvsEnumerator descriptive comment" into oc-dev

2017-05-26 00:25:42 +00:00

biometrics

Update makefiles. (2/2)

2017-05-22 17:15:20 +00:00

bluetooth

Bluetooth: Remove scheduler-service dependency

2017-05-27 02:14:18 +00:00

boot

Merge "Update makefiles." am: 9119d4ccd1 am: 242b2288d7

2017-05-20 00:19:40 +00:00

broadcastradio

Update makefiles. (2/2)

2017-05-22 17:15:20 +00:00

camera

Merge "Camera: fix release fence FD leaks" into oc-dev

2017-05-30 22:39:03 +00:00

configstore

Merge "configstore-utils: add feature to cache service handles" am: 03b02609ff am: fbb8bb0671

2017-05-25 01:24:03 +00:00

contexthub

Update makefiles. (2/2)

2017-05-22 17:15:20 +00:00

drm

Update makefiles. (2/2)

2017-05-22 17:15:20 +00:00

dumpstate

Update makefiles. (2/2)

2017-05-22 17:15:20 +00:00

gatekeeper

Update makefiles. (2/2)

2017-05-22 17:15:20 +00:00

gnss

Merge "GNSS HAL radio group for E911 SUPL" into oc-dev

2017-05-31 04:03:35 +00:00

graphics

Update makefiles. (2/2)

2017-05-22 17:15:20 +00:00

health

Update makefiles. (2/2)

2017-05-22 17:15:20 +00:00

ir

Update makefiles.

2017-05-19 15:53:53 -07:00

keymaster

Update makefiles. (2/2)

2017-05-22 17:15:20 +00:00

light

Update makefiles. (2/2)

2017-05-22 17:15:20 +00:00

media

Merge "Omx vts test." into oc-dev

2017-05-26 00:26:02 +00:00

memtrack

Update makefiles. (2/2)

2017-05-22 17:15:20 +00:00

nfc

Update makefiles.

2017-05-19 15:53:53 -07:00

power

Update makefiles. (2/2)

2017-05-22 17:15:20 +00:00

radio

resolve merge conflicts of 0e50326a to oc-dev-plus-aosp

2017-05-31 15:27:25 -07:00

renderscript

Fixed flaky RenderScript VTS Test am: 076f69aa2b am: c12c5abf68

2017-05-23 17:52:57 +00:00

sensors

Merge "Increase poll max size, avoid performance issue when batching" into oc-dev

2017-05-23 20:48:21 +00:00

soundtrigger

Update makefiles. (2/2)

2017-05-22 17:15:20 +00:00

tests

Remove versioning tests interfaces. am: 1cb1e14fae am: 45b2a58130

2017-05-26 19:15:52 +00:00

tetheroffload

Update makefiles.

2017-05-18 16:14:16 -07:00

thermal

Update makefiles. (2/2)

2017-05-22 17:15:20 +00:00

tv

Update makefiles. (2/2)

2017-05-22 17:15:20 +00:00

usb

Update makefiles. (2/2)

2017-05-22 17:15:20 +00:00

vibrator

Update makefiles. (2/2)

2017-05-22 17:15:20 +00:00

vr

Update makefiles. (2/2)

2017-05-22 17:15:20 +00:00

wifi

Merge "wifi(vts): Add retry for HAL start" into oc-dev

2017-05-23 00:45:05 +00:00

.clang-format

.clang-format: 100 lines

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

Android.bp

Add hidl_default and make modules use hidl_default.

2017-03-08 16:22:00 -08:00

CleanSpec.mk

Actually fix build breakage with cleanspec.

2017-05-10 22:35:20 +00:00

compatibility_matrix.xml

Add <kernel> entry to framework compat mat

2017-05-23 13:18:41 -07:00

current.txt

Merge "Fix typos in IEvsEnumerator descriptive comment" into oc-dev

2017-05-26 00:14:47 +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

PREUPLOAD.cfg

Enable the clang-format pre-submit hook

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

update-base-files.sh

Add annotations to create gnss-base.h

2017-01-23 08:41:15 -08: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%