Tim Kilbourn 505b28c105 resolved conflicts for merge of dfd39a7f to master ...

Change-Id: I51040a2e7de006a9864127bdff839dbadbf00879

2014-05-30 10:14:40 -07:00

api

Merge "DO NOT MERGE - Wifi Passpoint API change" into lmp-preview-dev

2014-05-30 17:08:07 +00:00

cmds

am f7871c31: am b9b31f4b: am bd4d3203: Merge "Support an ABI flag for instrumentation."

2014-05-30 11:51:03 +00:00

core

Merge "DO NOT MERGE - Wifi Passpoint API change" into lmp-preview-dev

2014-05-30 17:08:07 +00:00

data

Roboto v2

2014-05-23 11:25:47 -07:00

docs

am 0082933a: am d897fb53: am e16e367f: am 5ca630e8: Merge "change all the H1 tags to H2s and delete all HR tags then delete all clearflots, because they add useless whitespace once the "headerLine" class is obsolete THEN, cleanup some HTML to fix float clearance issue

2014-05-29 23:04:22 +00:00

drm

Fix a few more stray libcore.io references.

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

graphics

am 953fe800: Merge "Language and variant selection for Minikin" into lmp-preview-dev

2014-05-29 22:38:34 +00:00

include

camera2: Plumb DngCreator to native library.

2014-05-16 23:25:51 -07:00

keystore

Use the correct package name for CHOOSER

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

libs

Merge "Update HWUI matrix API"

2014-05-30 15:34:34 +00: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 "indicate in and out audio device connection separately"

2014-05-30 17:08:43 +00:00

native

am c7153377: am 73da981f: Merge "Remove getRequiredPermission from NDK." into klp-modular-dev

2014-05-23 18:04:18 +00:00

nfc-extras

…

obex

Fixed review comments

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

opengl/java

opengl: Un-hide GLES31 and GLES31Ext classes

2014-05-21 21:04:20 -07:00

packages

am 0eb33b30: Reduced overexpansion when expanding the panel

2014-05-30 15:35:35 +00:00

policy

resolved conflicts for merge of dfd39a7f to master

2014-05-30 10:14:40 -07:00

rs

Validate RenderScript context creation flags

2014-05-20 18:48:35 -07:00

samples/training/network-usage

…

sax

Remove unused imports from frameworks/base.

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

services

Merge "indicate in and out audio device connection separately"

2014-05-30 17:08:43 +00:00

telecomm/java

Merge "@hide Telecomm APIs [DO NOT MERGE]" into lmp-preview-dev

2014-05-28 22:14:07 +00:00

telephony/java

am 9cd3ff7d: Merge "Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change."

2014-05-29 04:57:25 +00:00

test-runner

Rename code related to cross-profile intents.

2014-05-23 13:16:01 +01:00

tests

Markup support for framework

2014-05-30 13:48:09 +00:00

tools

implement keyguardGoingAway() fixes build.

2014-05-29 10:53:46 -07:00

wifi/java/android/net/wifi

Merge "DO NOT MERGE - Wifi Passpoint API change" into lmp-preview-dev

2014-05-30 17:08:07 +00:00

Android.mk

Merge "DO NOT MERGE - Run the task manager service at startup" into lmp-preview-dev

2014-05-28 19:03:03 +00:00

CleanSpec.mk

Merge commit '1e5746c6' into mergemaster

2014-05-23 12:40:46 -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%