Andrew Solovay af46e1b404 resolved conflicts for merge of 44053b4e to mnc-dev ...

Change-Id: Ibe58da3f0b18bce138b9d8880bccfe61ebc0b2cf

2015-08-17 10:06:26 -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

Make "Ask every time" actually work that way

2015-08-13 18:56:05 -07:00

core

Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev

2015-08-17 14:47:49 +00:00

data

Fix issue #22989030: Separate battery whitelists

2015-08-07 14:23:32 -07:00

docs

Merge "docs: Fixed typo in Android for Work section in MNC Behavior Changes doc." into mnc-dev

2015-08-17 15:55:02 +00:00

drm

…

graphics

Ensure ripple mask is drawn at correct position

2015-08-11 14:25:45 -04:00

include

Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files

2015-06-22 16:11:32 -07:00

keystore

Add more examples of generating/importing keys to Javadocs.

2015-08-11 11:36:09 -07:00

libs

Fix crash in kModeProcessNoContext

2015-08-04 18:19:11 +00:00

location

Fix privacy leaks in LocationManager

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

media

Camera2: Add camera type to getNumberOfCameras.

2015-08-14 14:52:57 -07:00

native

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

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

nfc-extras

…

obex

OBEX: Handle GET operation properly

2015-05-16 01:19:19 +00:00

opengl/java

Add tracing to GLSurfaceView

2015-06-08 17:40:00 -07:00

packages

Merge "Introducing M Land." into mnc-dev

2015-08-14 19:59:48 +00:00

rs

[RenderScript] Add docs advising users about dstAtop bug.

2015-07-20 16:04:59 -07:00

samples/training/network-usage

…

sax

…

services

Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...

2015-08-14 14:08:43 -07:00

telecomm/java

Add GTS test to ensure valid default permission grants - framework

2015-08-12 21:57:59 -07:00

telephony/java

Save data registration roaming state

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

test-runner

Remove dependencies on the package installer's package name

2015-07-29 08:33:46 -07:00

tests

Fix issue #22940169: "pm grant" can no longer grant permissions...

2015-08-13 18:25:20 -07:00

tools

AAPT: Fix regression in resource versioning

2015-08-14 13:41:46 -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

docs: Update developer docs make file to include API 23

2015-08-12 19:45:22 -07:00

CleanSpec.mk

Remove device initializer status messages

2015-06-02 13:28:23 -04:00

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%