sqian 227fe277bf resolve merge conflicts of 6ecc54a7 to stage-aosp-master ...

Test: I solemnly swear I tested this conflict resolution.

Change-Id: I369fe9aacf37dcea6225b5e5a658159dfb859ad0

2017-07-18 14:12:10 -07:00

audio

Merge "audiohal: Prevent logspam when calling get_presentation_position" into oc-dev

2017-06-08 22:54:52 +00:00

automotive

Remove toString methods in Vehicle HAL.

2017-06-21 23:56:32 +00:00

biometrics

Update makefiles. (2/2)

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

bluetooth

Merge "Bluetooth: Change CHECK() to LOG_ALWAYS_FATAL()"

2017-07-07 03:24:53 +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 recursive lock in CameraDevice 1.0" into oc-dev

2017-06-23 17:59:26 +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

Merge "contexthub: Handle service death" into oc-dev

2017-06-06 16:49:48 +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 "Clear notification count to handle different flows" into oc-dev

2017-06-20 11:03:47 +00:00

graphics

Skip Validate

2017-06-22 05:57:18 +00:00

health

Update makefiles. (2/2)

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

ir

Update makefiles.

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

keymaster

Merge "Test import of a EC P-521 key." into oc-dev

2017-06-23 15:39:19 +00:00

light

Update makefiles. (2/2)

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

media

Increase Timeout for dequeue message

2017-06-10 05:19:54 +00:00

memtrack

Update makefiles. (2/2)

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

nfc

Nfc: Vts: modify WriteInvalidAndThenValidCommand

2017-06-16 19:58:18 +00:00

power

vts: fix TryDifferentGovernors in Power hal test

2017-06-24 02:10:23 +00:00

radio

resolve merge conflicts of 6ecc54a7 to stage-aosp-master

2017-07-18 14:12:10 -07:00

renderscript

Merge "Added protections to RenderScript VTS class teardown."

2017-07-14 22:46:57 +00:00

sensors

Zero uninitialized field in conversion and fix vts bug

2017-06-20 00:09:11 +00:00

soundtrigger

Update makefiles. (2/2)

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

tests

Merge "Move all hidl_test dependencies to the system.img"

2017-07-18 08:50:32 +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

[WIFI] Remove dependency on vendor-specific library

2017-05-31 11:15:31 -07: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

Skip Validate

2017-06-22 04:48:33 +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

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%