John Reck 49bc4acfad resolved conflicts for merge of fe5ac4fc to master ...

Change-Id: I6c0cc82db14b56297586469f940e408c0e218b3b

2015-01-29 12:53:38 -08:00

api

Introduce new MNC API version.

2015-01-28 15:08:52 -08:00

cmds

am f7049289: am 3812e68e: Merge "kill HAVE_PTHREADS."

2015-01-27 23:27:37 +00:00

core

Merge "Clear accessibility focus when the window loses visibility"

2015-01-29 18:37:38 +00:00

data

Add library definition for org.apache.http.legacy.

2015-01-21 12:49:14 +00:00

docs

am 820d5c52: am 8b1ad8e4: am 49738792: Doc change: Update Ads terms language. automerge: 3f9d57d automerge: e0b5a38

2015-01-29 01:24:42 +00:00

drm

Frameworks/base: Wall Werror in drm

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

graphics

Move drawable out of inset state, only store constant state

2015-01-27 12:07:33 -08:00

include

am 3523e4fc: am efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-dev

2015-01-27 23:34:35 +00:00

keystore

Merge "Remove DSA support from Android KeyStore and KeyChain."

2015-01-16 16:44:22 +00:00

libs

resolved conflicts for merge of fe5ac4fc to master

2015-01-29 12:53:38 -08:00

location

am a4c40c37: am 72d33849: Merge "Missing break in switch statement"

2014-12-30 12:29:38 +00:00

media

Merge "ImageReader: add support for compatible flexYUV buffers" into lmp-mr1-dev automerge: 8514766 automerge: 2a8dc00

2015-01-29 08:06:48 +00:00

native

Merge "Frameworks/base: Wall Werror in native/graphics"

2014-11-11 01:56:11 +00:00

nfc-extras

…

obex

…

opengl/java

…

packages

Fix SysUI tests to pass.

2015-01-29 15:58:23 +00:00

policy

am 4a40f7cc: Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev automerge: 1f81973

2015-01-28 21:32:37 +00:00

rs

am 02236295: am 4dd0cf42: Merge "Initialize clipping structure"

2015-01-27 20:54:08 +00:00

samples/training/network-usage

…

sax

…

services

Merge "MIDI Manager: Remove message packetization from MIDI transport"

2015-01-29 17:11:55 +00:00

telecomm/java

Add method in TelecomManager to return line1Number for a PhoneAccount.

2015-01-24 23:32:02 -08:00

telephony/java

am 8d702000: Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev automerge: f4e5236

2015-01-29 02:13:35 +00:00

test-runner

am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev

2014-11-21 00:43:51 +00:00

tests

Eliminate groupId and add task to AppWindowToken

2015-01-27 13:56:20 -08:00

tools

Remove TYPE_UNIVERSE_BACKGROUND from system

2015-01-27 15:16:58 -08:00

wifi/java/android/net/wifi

Merge "aggressively blacklist WifiConfiguration for the purpose of switching network" into lmp-mr1-dev automerge: d169839 automerge: 0a22d43

2015-01-29 05:04:48 +00:00

Android.mk

am 321e7246: am 301e1def: am 24328660: Merge "Check in "current" system API files." into lmp-mr1-dev

2015-01-22 20:58:16 +00:00

CleanSpec.mk

Remove dead code #7: Remove unused SysUI resources

2015-01-07 15:20:28 +01:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Remove DefaultHostnameVerifier from preloaded-classes.

2014-12-04 09:41:46 -08:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%