John Reck bf4b31f7b2 resolve merge conflicts of 04ce46db64 to master. ...

Change-Id: I935bb47718f0e7d5fb48945dd8de6e28dac136e5

2015-12-16 11:07:53 -08:00

api

Wire call to suspend a package

2015-12-16 18:14:14 +00:00

cmds

Merge "Temporarily stop proxying to cmd"

2015-12-08 17:07:15 +00:00

core

resolve merge conflicts of 04ce46db64 to master.

2015-12-16 11:07:53 -08:00

data

Use 'index' instead of 'ttcIndex' for attribute name.

2015-12-12 05:57:14 +00:00

docs

docs: removed duplicate "Synctrace" definition.

2015-12-11 09:04:25 -08:00

drm

Frameworks/base: Use Arrays.toString

2015-12-14 12:04:26 -08:00

graphics

Use 'index' instead of 'ttcIndex' for attribute name.

2015-12-12 05:57:14 +00:00

include

Camera: add RAW_PRIVATE format

2015-12-09 11:20:32 -08:00

keystore

DevicePolicy API to remove an installed KeyPair

2015-12-08 16:40:56 +00:00

libs

resolve merge conflicts of 04ce46db64 to master.

2015-12-16 11:07:53 -08:00

location

…

media

Merge "media: Add MIMETYPE_VIDEO_DOLBY_AVC and MIMETYPE_VIDEO_DOLBY_HEVC."

2015-12-11 17:47:43 +00:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

Merge "Adding catch for b/26221779"

2015-12-16 18:33:47 +00:00

rs

…

samples/training/network-usage

…

sax

…

services

Wire call to suspend a package

2015-12-16 18:14:14 +00:00

telecomm/java

Merge "Add PhoneAccount capability to indicate if VT uses presence."

2015-12-12 00:38:12 +00:00

telephony/java

Merge "Add KEY_VVM_CELLULAR_DATA_REQUIRED_BOOLEAN to CarrierConfigManager"

2015-12-09 20:18:01 +00:00

test-runner

Wire call to suspend a package

2015-12-16 18:14:14 +00:00

tests

Merge "Check for null hostnames in RootTrustManager" am: 49ce7dc2ba

2015-12-14 12:03:22 -08:00

tools

Wire call to suspend a package

2015-12-16 18:14:14 +00:00

wifi/java/android/net/wifi

Frameworks/base: Use Arrays.toString

2015-12-14 12:04:26 -08:00

Android.mk

…

CleanSpec.mk

…

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%