Andrew Scull 8203155664 resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev am: eb35ad9969 am: 3aac3ebee1 ...

am: 3c9b36482f

Change-Id: I2eb73ac546ce8be144ec96fcac573caa2c5e8a13

2017-01-13 21:23:27 +00:00

api

Merge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d"

2017-01-12 11:27:32 +00:00

cmds

Added BUGREPORT_OPTION_TELEPHONY.

2017-01-11 23:09:01 +00:00

core

resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev am: eb35ad9969 am: 3aac3ebee1

2017-01-13 21:23:27 +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

Merge "Use half-width quotes in code example." am: 1fe99a819c am: 161d1487ba

2017-01-05 22:05:33 +00:00

drm

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

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

graphics

docs: update Paint.setTextSize() to indicate pixel units am: 5f05256106 am: 9c834b1241

2016-12-19 20:27:51 +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

Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)" am: 2225a0640b am: d1740f0f5b

2017-01-12 15:59:48 +00:00

location

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

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

media

Merge "Replace cutils/log.h and log/logger.h with log/log.h" am: e7fcbcb991

2017-01-11 15:40:24 +00:00

native

Unversion NDK stub libraries.

2017-01-06 11:04:14 -08: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

Merge "Default Carrier app for traffic mitigation" am: 4533b1ccdd am: 1d0877f59e

2017-01-13 21:15:55 +00:00

proto

Create a global registry for system message IDs

2017-01-12 21:23:11 +00:00

rs

Merge "Rely on the platform -std default."

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

samples/training/network-usage

…

sax

…

services

resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev am: eb35ad9969 am: 3aac3ebee1

2017-01-13 21:23:27 +00:00

telecomm/java

Add reason code used to tell dialer when call failed due to WFC being off.

2016-12-12 17:17:21 +00:00

telephony/java

Merge "Default Carrier app for traffic mitigation" am: 4533b1ccdd am: 1d0877f59e

2017-01-13 21:15:55 +00:00

test-runner

Copy junit-runner files into test-runner.

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

tests

DO NOT MERGE Stricter NetworkNotificationManagerTest

2016-12-20 06:49:08 +00:00

tools

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

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

wifi

DO NOT MERGE: Fix to maintain the Carrier Network connection.

2017-01-13 20:58:09 +00:00

Android.bp

Convert libandroidfw to Android.bp

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

Android.mk

Rename the Bluetooth profile classes for HID Device role. am: 0afe190af5 am: 94e3d3f499

2016-12-29 20:00:09 +00:00

CleanSpec.mk

…

compiled-classes-phone

Add a mechanism for configuring the A2DP Source codecs

2017-01-03 17:52:52 -08: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

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%