Wale Ogunwale 12b4a4a7ec resolved conflicts for merge of 60df172f to master ...

Change-Id: I15f90e041399d2133c041b0449e6d6a95d36595a

2015-04-06 09:16:26 -07:00

api

Merge "Add MidiManager and MidiDevice classes to public API."

2015-04-06 15:53:36 +00:00

cmds

am 1c329e85: am 855998d0: am c90a4418: Merge "idmap: scan missing include for sys/stat.h"

2015-04-01 17:33:31 +00:00

core

Merge "Reset transitionAlpha when the transition is stopped early."

2015-04-06 14:22:46 +00:00

data

Allow override of Motoya with full NotoSans

2015-03-26 15:37:46 -07:00

docs

am 6f403e69: am d093ad1a: am 7abeba63: am 0d53fcad: am d642f829: am 54dee349: docs: Fixed broken urls in the UI testing training main page and revised intro to the \'Testing UI for a Single App\' class.

2015-04-04 01:27:53 +00:00

drm

Frameworks/base: Wall Werror in drm

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

graphics

Merge "Add group scaling factor into stroke width."

2015-04-03 20:09:02 +00:00

include

Merge "AAPT2"

2015-04-03 00:06:34 +00:00

keystore

am ba88b692: am e2e5b88e: am 64b0062a: Merge "Load fewer classes when AndroidKeyStore provider is installed."

2015-04-03 20:33:29 +00:00

libs

Delete pre-glop path

2015-04-03 13:01:18 -07:00

location

Replace usages of deprecated Resources.getColor() and getColorStateList()

2015-03-18 18:37:18 -07:00

media

Merge "Add MidiManager and MidiDevice classes to public API."

2015-04-06 15:53:36 +00:00

native

am 1c8b3778: am 9aeb080e: Merge "Switch libjnigraphics to sysv-only hash style"

2015-03-13 21:59:25 +00:00

nfc-extras

…

obex

Bluetooth: Support MAP Client role on Bluedroid.

2014-07-01 18:01:27 +00:00

opengl/java

Cleanup Bitmap JNI attempt #2

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

packages

Merge "Import translations. DO NOT MERGE"

2015-04-06 12:58:57 +00:00

rs

am 1327fa9e: am 511eb660: am 6aed9ec1: Merge "[RenderScript] update exception reporting for copyTo() after autoPadding added."

2015-04-03 18:18:01 +00:00

samples/training/network-usage

…

sax

…

services

resolved conflicts for merge of 60df172f to master

2015-04-06 09:16:26 -07:00

telecomm/java

Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge

2015-03-24 13:46:08 -07:00

telephony/java

Merge "Protect against null ITelephony to fix crash."

2015-04-03 21:24:07 +00:00

test-runner

Add IntentFilter auto verification

2015-03-30 10:58:35 -07:00

tests

Merge "Add group scaling factor into stroke width."

2015-04-03 20:09:02 +00:00

tools

am 66d94512: am dbb5f5d6: am efcbaec1: Merge "Only Windows doesn\'t have %zd."

2015-04-03 20:58:25 +00:00

wifi/java/android/net/wifi

Merge changes from topic 'mwd-merge-040115'

2015-04-02 03:08:02 +00:00

Android.mk

Add more internal API's for assist

2015-04-03 11:12:03 -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

Load fewer classes when AndroidKeyStore provider is installed.

2015-04-03 12:45:16 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%