Brad Ebinger 4fb8988854 resolve merge conflicts of ac9b2c4fab to stage-aosp-master ...

Change-Id: I4a6094c41ab267f89a15c5e8caa25e6b683419d0

2017-02-22 16:04:39 -08:00

api

resolve merge conflicts of ac9b2c4fab to stage-aosp-master

2017-02-22 16:04:39 -08:00

cmds

Merge changes from topic 'svcusb' am: 5e2a2ee39e am: 6f44072d03

2017-02-17 02:24:44 +00:00

core

Merge "Add UI prompt for MMI code failure on 3gpp"

2017-02-22 23:22:07 +00:00

data

Add Wear keycodes to emulator key layout file.

2017-02-01 17:57:16 +00:00

docs

Fix @links in reference docs. am: 54de77470d am: ab978c035e

2017-01-26 04:44:54 +00:00

drm

Stop including libcore/include/ in most of frameworks/base.

2016-09-15 13:13:39 -07:00

graphics

Fix @links in reference docs. am: 54de77470d am: ab978c035e

2017-01-26 04:44:54 +00:00

keystore

Prepare for removal of legacy-test from default targets

2017-01-19 09:43:05 +00:00

legacy-test

Add legacy-android-test target containing android.test classes

2017-01-17 20:37:35 +00:00

libs

Merge "Remove uncessary dependency of libhwui" am: df36be5f17 am: eebd7d7970

2017-02-07 00:12:49 +00:00

location

Move dump() to dumpAsync(), more oneway calls.

2016-12-07 12:24:21 -08:00

media

Update the exception description for start(). am: ac06177a13 am: 8b137cc06b

2017-02-11 01:38:34 +00:00

native

Compile native network functionis into libandroid_net.

2017-01-13 23:01:32 +00:00

nfc-extras

Prepare for removal of legacy-test from default targets

2017-01-19 09:43:05 +00:00

obex

OBEX: Set Min maxPacketLength negotiated in CONNECT Operation.

2017-02-03 21:47:39 +00:00

opengl/java

docs: Update gluUnProject parameter description.

2017-02-03 18:40:27 -06:00

packages

Merge "SettingsLib: wifi: Fixed AccessPoint tracking for Passpoint networks"

2017-02-21 18:39:01 +00:00

proto

Merge "Move wifi.proto to shared service .jar"

2017-02-21 17:56:13 +00:00

rs

Fix @links in reference docs. am: 54de77470d

2017-01-26 04:39:57 +00:00

samples/training/network-usage

…

sax

Prepare for removal of legacy-test from default targets

2017-01-19 09:43:05 +00:00

services

Merge "Revert "Remove outdated emulator check which causes BT to not start""

2017-02-21 23:32:32 +00:00

telecomm/java

Merge "Introduce APIs for RTT calls (part 1)"

2017-02-22 18:56:48 +00:00

telephony/java

resolve merge conflicts of ac9b2c4fab to stage-aosp-master

2017-02-22 16:04:39 -08:00

test-runner

Merge "Remove conflicting package information for junit.runner and junit.textui"

2017-02-22 15:24:27 +00:00

tests

Merge "IP connectivity metrics: delete obsolete logger service" am: 37e3f22c2e am: c54962a4bd

2017-02-17 00:18:35 +00:00

tools

Merge "Use asm-5.2 prebuilt" am: 6b32770d6d am: 6c1ac4dd80

2017-02-14 19:22:27 +00:00

wifi

Merge "[AWARE] Remove enableUsage/disableUsage API"

2017-02-17 22:18:32 +00:00

Android.bp

Convert libandroidfw to Android.bp

2016-12-02 11:23:12 -08:00

Android.mk

Merge changes I82aa8140,Ib62a5dd6,I2c4d64e2

2017-02-17 22:25:53 +00:00

CleanSpec.mk

Fix incremental build

2016-03-03 10:19:27 -08:00

compiled-classes-phone

Update the A2DP Codec Config API

2017-01-31 18:58:27 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Fix a bunch of repeated reads of a ro.* property

2017-01-27 11:04:39 -08:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%