Bryce Lee d389684bea resolved conflicts for merge of 91d2cbf4 to mnc-dev ...

Change-Id: I1c7e2999483a7959630844ecd20f5f37b7896aae

2015-06-23 17:06:51 -07:00

api

Merge "Fix issue #20654534: API Review: android.app.assist" into mnc-dev

2015-06-23 23:34:22 +00:00

cmds

Update surfaces secure flag on screen capture setting change

2015-06-23 09:08:29 -07:00

core

Merge "Throw IAE on invalid measure spec size" into mnc-dev

2015-06-23 23:41:03 +00:00

data

Fix ascent and descent of Droid Sans Mono to match Roboto.

2015-06-13 18:49:35 -07:00

docs

Remove not needed contacts related permissions.

2015-06-23 23:03:55 +00:00

drm

…

graphics

Remove isDither(), deprecate setDither()

2015-06-23 14:30:40 -07:00

include

ZipFileRO: Use precise widths for zip file types.

2015-06-17 08:40:25 +00:00

keystore

Merge "Keymaster key validity dates are optional." into mnc-dev

2015-06-23 20:35:30 +00:00

libs

Merge "Dump GL errors and crash on failure to allocate texture for layer" into mnc-dev

2015-06-23 18:01:02 +00:00

location

Fix privacy leaks in LocationManager

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

media

Merge "TIF: Always invalidate the session callback when resetting TvView" into mnc-dev

2015-06-23 21:28:00 +00:00

native

Add native tracing API

2015-06-10 13:10:36 -07: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 "Add metrics to brightness slider" into mnc-dev

2015-06-23 19:56:13 +00:00

rs

Merge "[RenderScript] Add documentation for IntrinsicBLAS, and @hide annotations." into mnc-dev

2015-06-19 21:19:56 +00:00

samples/training/network-usage

…

sax

…

services

resolved conflicts for merge of 91d2cbf4 to mnc-dev

2015-06-23 17:06:51 -07:00

telecomm/java

Fix crash when doing conferencing over Wi-Fi

2015-06-21 10:25:13 -07:00

telephony/java

Return reasonable phone type if no sim inserted.

2015-06-22 15:56:46 -07:00

test-runner

Fix issue #21814207 and issue #21814212 (alarm manager)

2015-06-17 11:41:45 -07:00

tests

Fix issue #20654534: API Review: android.app.assist

2015-06-22 15:14:17 -07:00

tools

Merge "AAPT2: Remove the need for specifying package name in compile phase" into mnc-dev

2015-06-18 17:29:31 +00:00

wifi/java/android/net/wifi

Address API review comments

2015-06-22 19:09:38 -07:00

Android.mk

Default permissions for carrier apps.

2015-06-23 09:55:23 -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%