Roshan Pius 55bfe49862 Merge changes I304a5d9d,Ied19d9ec,Ie6c03aee ...

am: 9f518064de

Change-Id: Id45ea1662cbc1b3b7c367cd17017b42b9ed8a856

2016-11-29 18:04:14 +00:00

benchmarks

Update makefiles for logging.

2016-11-21 16:19:57 -08:00

bluetooth

Update makefiles for logging.

2016-11-21 16:19:57 -08:00

boot

Merge "Update makefiles for logging."

2016-11-24 16:41:20 +00:00

nfc

Nfc: Change return types for Nfc hal to specified type.

2016-11-29 01:14:26 +00:00

radio

Update makefiles for logging.

2016-11-21 16:19:57 -08:00

tests

Use get instead of implicit cast on Return<*>.

2016-11-28 12:06:22 -08:00

wifi

wifi: Add NAN API wrappers in WifiLegacyHal

2016-11-28 15:31:19 -08:00

Android.bp

Stop all these merge conflicts.

2016-10-26 12:05:29 +02: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

update-makefiles.sh

Stop all these merge conflicts.

2016-10-26 12:05:29 +02: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%