Jack Yu cba59432ba resolve merge conflicts of 80a0e6d to nyc-mr2-dev-plus-aosp ...

Test: telephony unit tests
Change-Id: Id4454c97eca5f0261001369d0ec5030775bf9887

2016-11-18 09:23:00 -08:00

api

Merge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7"

2016-11-17 15:41:57 +00:00

cmds

DO NOT MERGE ANYWHERE Add supports-multiwindow command to am.

2016-11-17 23:16:36 +00:00

core

Merge "Fix coretests: Remove dependency on libnativehelper" am: f68cb55cc1 am: 6a5e1a7f4a

2016-11-17 19:06:02 +00:00

data

…

docs

App Shortcut: Clarify which attributes must be resources am: 104f805337 am: 2a3fe7d979

2016-11-11 23:36:04 +00:00

drm

…

graphics

Scale bitmap shaders for target density

2016-10-07 20:39:48 +00:00

include

Move one more libandroidfw header

2016-11-04 15:49:43 -07:00

keystore

Add the onDeviceOffBody API method to KeyStore

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

libs

Merge "Avoid starving RT anims" am: f77c220aa9

2016-11-18 00:28:54 +00:00

location

Fix GNSS status delivery to the callbacks

2016-10-24 13:33:47 -07:00

media

Merge "Make AmrInputStream use MediaCodec" am: 866658261f

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

native

Re-unite sources with their headers

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

nfc-extras

…

obex

…

opengl/java

…

packages

Merge "Don't disconnect an A2DP device when connecting to same device" am: 3ebcf1218b am: c15cc348e8

2016-11-17 07:22:23 +00:00

proto

…

rs

Merge "Rely on the platform -std default."

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

samples/training/network-usage

…

sax

…

services

Catch KeyStoreException for setting profile lock am: c8fa5ed8f2 am: 3b546019dc

2016-11-18 01:47:06 +00:00

telecomm/java

Merge "Readability improvements in Logging" am: d51df736f6

2016-11-17 19:35:08 +00:00

telephony/java

resolve merge conflicts of 80a0e6d to nyc-mr2-dev-plus-aosp

2016-11-18 09:23:00 -08:00

test-runner

…

tests

…

tools

Merge "Preload2: Fix dependencies"

2016-11-16 18:25:37 +00:00

wifi

Merge "wifi: hotspot2: add support for validating passpoint configuration"

2016-11-18 08:54:11 +00:00

Android.bp

…

Android.mk

Merge "[NAN-AWARE] Rename NAN to Aware" am: 74b1131cc8

2016-11-06 03:21:37 +00:00

CleanSpec.mk

…

compiled-classes-phone

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

…

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%