Elliott Hughes 92c45b222c resolved conflicts for merge of 6a4c12da to master-nova ...

Change-Id: I108a86d599b0d692f8d13f8f3d29187db45c6467

2014-05-08 20:23:39 -07:00

api

resolved conflicts for merge of 6a4c12da to master-nova

2014-05-08 20:23:39 -07:00

cmds

am c8a045d4: am 41f40581: Merge "Fix x86 build in app_process."

2014-05-01 10:43:23 +00:00

core

am b87cf3a0: Bump the batterystats checkin stats version number.

2014-05-09 02:09:11 +00:00

data

am e8628797: am 09446329: am 52025796: Merge "Map KEY_APPSELECT to APP_SWITCH."

2014-05-02 22:15:06 +00:00

docs

Add android.hardware.camera.external feature.

2014-05-08 11:53:01 -07:00

drm

Fix a few more stray libcore.io references.

2014-04-28 20:49:24 -07:00

graphics

Merge "Improve documentation of setOnFrameAvailableListener."

2014-05-08 20:22:46 +00:00

include

DO NOT MERGE Add DrawGlInfo kModeProcessNoContext

2014-05-01 15:51:41 -07:00

keystore

Use the correct package name for CHOOSER

2014-03-17 16:21:56 -07:00

libs

Add logging utility methods

2014-05-08 13:57:05 -07:00

location

Make sure FLP HAL statuses currently used are translated (if needed) correctly into the framework.

2014-04-25 11:39:16 -07:00

media

Merge "AudioService/WireAccessoryManager: change boot completion detection method"

2014-05-08 23:25:49 +00:00

native

Bug fix for wakeup sensors.

2014-04-23 17:05:41 -07:00

nfc-extras

Clean up dist files.

2013-05-21 12:38:22 -07:00

obex

Fixed review comments

2013-09-12 19:07:28 -07:00

opengl/java

am 43cea7ea: am 650a8860: am fc3c6a0e: Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested."

2014-04-21 19:49:40 +00:00

packages

am 12c9e3a0: Merge "Removing the old tasks on launching recents task if they trigger a new task."

2014-05-08 22:38:15 +00:00

policy

am c41fa708: am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modular-dev

2014-05-06 20:24:23 +00:00

rs

am db55bb06: am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."

2014-05-08 18:31:18 +00:00

samples/training/network-usage

cherrypick from ics-mr1 docs: source for nw app Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2

2012-08-08 11:27:09 -07:00

sax

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

services

Merge "AudioService/WireAccessoryManager: change boot completion detection method"

2014-05-08 23:25:49 +00:00

telecomm/java

Merge "Add toString to CallServiceDescriptor" into master-nova

2014-04-15 18:41:37 +00:00

telephony/java

am 192384bb: am 43799457: am 74ec5808: am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"

2014-05-01 18:07:58 +00:00

test-runner

Cleaning code related to the forwarding intent filters.

2014-05-06 13:54:48 +01:00

tests

Further cleaning on animated part of VectorDrawable.

2014-05-08 10:16:34 -07:00

tools

Encapsulate Canvas.mNativeCanvas

2014-05-06 21:07:19 -04:00

wifi/java/android/net/wifi

Don't crash when asked to enable an AP with a null SSID.

2014-05-09 00:43:35 +00:00

Android.mk

am 60549e20: Merge "Usage stats!"

2014-05-08 22:04:02 +00:00

CleanSpec.mk

Make GET_TASKS signature|system.

2014-05-02 11:51:26 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Remove VideoEditor

2014-04-21 16:11:51 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%