Christopher Wiley 27a0be36ee resolved conflicts for ddf53180 to stage-aosp-master ...

Change-Id: I265ab876ef29dc731e6abb6f964c10f2e71324be

2015-09-14 07:34:50 -07:00

api

Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev

2015-08-13 00:46:59 +00:00

cmds

am e62421f1: Merge "Teach Pm about the "always ask" link-handling state" into mnc-dev

2015-08-26 00:20:03 +00:00

core

Update KeymasterDefs

2015-09-10 14:00:34 -06:00

data

am 53c38c88: Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev

2015-08-19 01:40:36 +00:00

docs

am 3460304c: Merge "Update RS docs for M-related changes."

2015-09-11 02:47:16 +00:00

drm

…

graphics

am c0ce6c42: Merge "Reduce risk of memory corruption due to finalization."

2015-09-09 22:41:42 +00:00

include

Allow debugging only for apps forked from zygote

2015-08-10 20:39:13 +02:00

keystore

Update KeymasterDefs

2015-09-10 14:00:34 -06:00

libs

am 60dd5d59: Merge "Remove USE_MINGW, whitelist windows modules"

2015-09-01 16:37:10 +00:00

location

Fix privacy leaks in LocationManager

2015-06-22 12:42:53 -07:00

media

am d9eef347: Merge "MIDI docs: fix buffer allocation" into mnc-dev

2015-08-21 23:31:48 +00:00

native

Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."

2015-07-29 09:35:46 +00:00

nfc-extras

…

obex

…

opengl/java

…

packages

am 4140a21e: Merge "Fix scrolling of QS panel when no notification is present."

2015-09-12 01:21:49 +00:00

rs

am ed3ffe0f: am 6430812a: Merge "RenderScript: implement a Script entry point for calling a reduce-style kernel."

2015-07-23 22:54:59 +00:00

samples/training/network-usage

…

sax

…

services

resolved conflicts for merge of ef57e5e0 to stage-aosp-master

2015-09-02 22:57:53 +09:00

telecomm/java

Fix incorrect android.telecom.Call.Details equality check.

2015-08-19 20:52:13 +00:00

telephony/java

Save data registration roaming state

2015-08-11 16:28:11 +00:00

test-runner

am 9352af2a: Merge "Remove dependencies on the package installer\'s package name" into mnc-dev

2015-07-29 18:18:10 +00:00

tests

am 81f3a85a: Merge "Fix issue #22940169: "pm grant" can no longer grant permissions..." into mnc-dev

2015-08-14 17:15:10 +00:00

tools

resolved conflicts for ddf53180 to stage-aosp-master

2015-09-14 07:34:50 -07:00

wifi/java/android/net/wifi

Merge "Boot loop when SSID has non UTF-8 character in the name" into mnc-dev

2015-08-05 01:10:34 +00:00

Android.mk

am 8d149d7f: Merge "docs: Update developer docs make file to include API 23" into mnc-dev

2015-08-13 18:33:58 +00:00

CleanSpec.mk

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Frameworks/base: Update preloaded-classes

2015-06-18 20:35:10 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%