Amith Yamasani 0c25fbde82 resolved conflicts for merge of 5f1c2dbc to master ...

Change-Id: I4d08ad224c8cddd1d379c0f9ec326165a08dd651

2015-06-19 17:04:02 -07:00

api

am 1db4e1a1: am 1fff1371: am df584d34: Merge "[RenderScript] Add documentation for IntrinsicBLAS, and @hide annotations." into mnc-dev

2015-06-19 22:04:00 +00:00

cmds

am d21b695f: am 22433a33: Merge "Fix issue #21814207 and issue #21814212 (alarm manager)" into mnc-dev

2015-06-17 22:43:51 +00:00

core

resolved conflicts for merge of 5f1c2dbc to master

2015-06-19 17:04:02 -07:00

data

am 61744be8: am e1debb75: Merge "Fix ascent and descent of Droid Sans Mono to match Roboto." into mnc-dev

2015-06-15 21:47:29 +00:00

docs

am 9ab0210e: am d61ebca9: am a36de70a: am cadd531e: am 4fdaf938: docs: Design section fixes for new templates

2015-06-19 22:41:01 +00:00

drm

…

graphics

Invalidate the cached ripple drawable mask if mask layer changes

2015-06-19 13:42:39 -07:00

include

ZipFileRO: Use precise widths for zip file types.

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

keystore

Use consistent cases for aliases in AndroidKeystoreBCWorkaround.

2015-06-18 09:52:11 +00:00

libs

am 4c50df66: am 5131e025: am 4600dd05: ZipFileRO: Use precise widths for zip file types.

2015-06-17 10:16:43 +00:00

location

Add way to get the network location provider package

2015-06-17 15:16:51 -04:00

media

Merge "ImageReader: Fix format workarounds for legacy devices" into mnc-dev

2015-06-19 19:51:42 +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

am f65f06fe: am cefeeb7c: am 4f43dc04: Assist disclosure

2015-06-19 20:43:31 +00:00

rs

am 1fff1371: am df584d34: Merge "[RenderScript] Add documentation for IntrinsicBLAS, and @hide annotations." into mnc-dev

2015-06-19 21:49:20 +00:00

samples/training/network-usage

…

sax

…

services

resolved conflicts for merge of 5f1c2dbc to master

2015-06-19 17:04:02 -07:00

telecomm/java

Clean up SIM CallManager APIs.

2015-06-18 16:13:54 -07:00

telephony/java

Merge "Add comments to carrierconfigmanager for required permission." into mnc-dev

2015-06-19 20:31:56 +00:00

test-runner

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

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

tests

Merge "Separate 2 clip paths into 2 groups" into mnc-dev

2015-06-18 17:05:13 +00:00

tools

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

2015-06-18 17:54:27 +00:00

wifi/java/android/net/wifi

add creation/update time to WifiConfiguration

2015-06-16 16:56:29 -07:00

Android.mk

Add system API to watch for permission changes

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

CleanSpec.mk

Remove device initializer status messages

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

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Move Android Keystore impl to android.security.keystore.

2015-05-13 16:17:40 -07:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%