Andrew Solovay f377bffb30 am a8f68d2d: am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev ...

* commit 'a8f68d2da7733673d25fd1e5573539bf29b71ee4':
  docs: Updating the permissions docs for Preview 3.

2015-08-17 17:45:46 +00:00

api

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

2015-08-13 01:02:26 +00:00

cmds

Make "Ask every time" actually work that way

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

core

am c57f309a: Merge "Add experimental camera session prepare API." into mnc-dr-dev

2015-08-17 17:37:16 +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

am 70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev

2015-08-04 19:48:30 +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

Call getInstanceForPackage instead of creating a new SensorManager instance.

2015-07-30 19:04:40 +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

Import translations. DO NOT MERGE

2015-08-17 06:52:31 -07:00

rs

[RenderScript] Add docs advising users about dstAtop bug.

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

samples/training/network-usage

…

sax

…

services

am 877c2257: Merge "instrument fingerprint service" into mnc-dr-dev

2015-08-17 16:52:29 +00:00

telecomm/java

am 4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev

2015-08-14 15:19:47 +00:00

telephony/java

am 737aed41: Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev

2015-08-12 23:17:27 +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

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%