Marie Janssen 5e9774c184 resolve merge conflicts of ffcf88f to nyc-mr2-dev-plus-aosp ...

Change-Id: Ib8c2e6770448bda00c0d64b42ce0495049acb268

2016-12-19 10:32:20 -08:00

api

Merge "Make TelephonyManager APIs public:"

2016-12-16 10:37:21 +00:00

cmds

Add WiFi toggle prompts - framework

2016-12-13 16:02:23 +00:00

core

DO NOT MERGE Add network logging icon to Quicksettings when enabled

2016-12-19 18:03:47 +00:00

data

Merge "Remove net_bt_stack group and replace it with bluetooth" am: 2309b98b25 am: 4a1fd7eb3d

2016-09-22 21:58:14 +00:00

docs

docs: Add deprecation message for the developer.android.com docs am: b9bd6cca9e am: 045ae0458a am: e161f75d38 am: 536dc4ecc4

2016-12-17 05:09:37 +00:00

drm

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

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

graphics

docs: update description for BitmapFactory.Options#inBitmap am: a8f4286272

2016-12-17 02:28:22 +00:00

keystore

Add the onDeviceOffBody API method to KeyStore

2016-10-06 16:13:48 +00:00

legacy-test

Copy core-junit files into legacy-test.

2016-12-14 14:19:08 +00:00

libs

Move hwui private headers to frameworks/base/libs/hwui/private am: 19def9943a am: 174d150673

2016-12-15 07:30:25 +00:00

location

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

2016-12-02 15:17:20 -08:00

media

Merge "Fix a memory leak." am: 1715678a89

2016-12-14 23:41:26 +00:00

native

Re-unite sources with their headers

2016-11-04 13:27:37 -07:00

nfc-extras

…

obex

Allow getResponseCode to block if response hasn't been received from remote

2016-08-22 18:25:14 +00:00

opengl/java

update GlSurfaceView:onPause/Resume docs

2016-06-29 14:40:42 -07:00

packages

DO NOT MERGE Add network logging icon to Quicksettings when enabled

2016-12-19 18:03:47 +00:00

proto

DO NOT MERGE Define Network notification proto constants.

2016-12-15 14:32:45 +09:00

rs

Merge "Rely on the platform -std default."

2016-10-08 21:45:16 +00:00

samples/training/network-usage

…

sax

…

services

DO NOT MERGE Add network logging icon to Quicksettings when enabled

2016-12-19 18:03:47 +00:00

telecomm/java

Add ability to set supported audio routes on phone accounts and connection

2016-12-13 17:48:50 -08:00

telephony/java

Add carrier config key KEY_EDITABLE_TETHER_APN_BOOL.

2016-12-16 22:35:13 +00:00

test-runner

Copy junit-runner files into test-runner.

2016-12-14 10:41:05 +00:00

tests

DO NOT MERGE Network notifications: revamp keying scheme

2016-12-19 08:29:23 +00:00

tools

Merge "Clean up local hprofs" am: 9ab94e15c7 am: 1876d82450

2016-12-18 00:28:42 +00:00

wifi

Add WiFi toggle prompts - framework

2016-12-13 16:02:23 +00:00

Android.bp

Convert libandroidfw to Android.bp

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

Android.mk

Copy core-junit files into legacy-test. am: cd7c34d8bf am: 98e609d556

2016-12-14 15:15:51 +00:00

CleanSpec.mk

Fix incremental build

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

compiled-classes-phone

Frameworks/base: Update compiled-classes-phone

2016-06-07 03:12:03 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Merge "Ensure apps cannot prevent uncaught exceptions being logged."

2016-08-09 09:02:27 +00:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%