Cedric Ho 4e41767977 resolved conflicts for merge of 0af3af03 to mnc-dev ...

Change-Id: I38f423be6dcef216cf813aa0f747be38f0ad792f

2015-04-27 13:16:18 -07:00

api

Allow device initializers to set a preferred setup activity.

2015-04-27 12:57:15 -04:00

cmds

Migrate primary external storage.

2015-04-24 18:01:45 -07:00

core

resolved conflicts for merge of 0af3af03 to mnc-dev

2015-04-27 13:16:18 -07:00

data

Merge "Mark AVRCP devices as internal."

2015-04-15 11:38:58 +00:00

docs

am 2a8ef256: am 495227aa: Doc change: update dff image.

2015-04-25 22:05:38 +00:00

drm

Frameworks/base: Wall Werror in drm

2014-11-10 17:23:02 -08:00

graphics

Merge "Fix the build: Revert "Anti-alias by default""

2015-04-24 04:58:48 +00:00

include

am 7b09e7a9: am 44d7989a: am 571c5a26: Merge "Fix UB in ResourceTable::stringToInt."

2015-04-15 00:07:01 +00:00

keystore

am 6c1af7ea: am 8652bce1: am c71f2648: Merge "frameworks/base: switch to using NativeConstants."

2015-04-24 22:13:26 +00:00

libs

am 05ad674a: am 00e165ae: am e8101c04: Merge "fix compiler error under FORTIFY_SOURCE=2"

2015-04-25 22:05:25 +00:00

location

Update GpsMeasurements APIs to reflect changes in GPS HAL.

2015-04-15 12:57:17 -07:00

media

Add near-ultrasound properties to AudioManager.java

2015-04-27 10:37:17 -07:00

native

GraphicsJNI Canvas cleanup

2015-04-22 09:34:34 -07:00

nfc-extras

…

obex

OBEX Over L2CAP + SDP search API for BT profiles

2015-04-11 01:49:11 +00:00

opengl/java

Cleanup Bitmap JNI attempt #2

2015-03-05 13:56:16 -08:00

packages

DO NOT MERGE Do not clean up global/system settings on package unintalls.

2015-04-27 17:49:35 +00:00

rs

Merge "GraphicsJNI Canvas cleanup"

2015-04-22 20:00:46 +00:00

samples/training/network-usage

…

sax

…

services

resolved conflicts for merge of 0af3af03 to mnc-dev

2015-04-27 13:16:18 -07:00

telecomm/java

Merge "Doc fix - incorrect format (included argument) for function reference."

2015-04-25 01:44:27 +00:00

telephony/java

Merge changes from topic 'mwd-merge-042415'

2015-04-25 00:51:47 +00:00

test-runner

Package and storage movement callbacks.

2015-04-23 20:32:17 -07:00

tests

Add "assist block" API.

2015-04-22 17:36:48 -07:00

tools

Merge "Properly mangle file names"

2015-04-25 01:21:00 +00:00

wifi/java/android/net/wifi

Merge commit '7e5e791' into merge2

2015-04-24 14:05:29 -07:00

Android.mk

Adding Carrier Config API.

2015-04-16 11:40:33 -07:00

CleanSpec.mk

Clean-up stale inputflinger binaries and associated libs.

2015-02-24 12:11:37 -08:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Added SystemServiceRegistry to preloaded-classes

2015-04-24 13:34:00 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%