Christopher Tate 825b713469 resolve merge conflicts of 44e07e0 to mnc-dev ...

Change-Id: Ibc446c82a3d1446ccd81630743f82d1fd58fbd47

2016-04-20 13:33:41 -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

Teach Pm about the "always ask" link-handling state

2015-08-25 12:39:04 -07:00

core

Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev

2016-04-18 18:40:19 +00:00

data

Revert "Create a special CONSTRAINED font bucket in frameworks."

2015-08-18 12:17:13 -07:00

docs

Camera: Minor documentation update

2015-11-13 15:25:45 -08:00

drm

…

graphics

Translate ripple mask to account for drawable bounds

2015-08-20 16:27:21 -04:00

include

am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE

2015-08-21 10:09:22 +00:00

keystore

Add more examples of generating/importing keys to Javadocs.

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

libs

Constrain drawBitmap matrix-to-rect optimization

2015-08-18 14:53:47 -07:00

location

Fix privacy leaks in LocationManager

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

media

DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread

2015-12-02 23:28:28 +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

Add tracing to GLSurfaceView

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

packages

Merge "Don't allow contact sharing by default for device not recognized as carkit." into mnc-dev

2015-11-17 01:07:28 +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

resolve merge conflicts of 44e07e0 to mnc-dev

2016-04-20 13:33:41 -07:00

telecomm/java

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

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

telephony/java

Check permissions on getDeviceId.

2015-12-07 11:19:20 -08: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

DO NOT MERGE: AAPT: Dump uses-permission-sdk-23

2015-12-16 22:43:07 +00: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%