Alan Viverette c65c7ae635 Merge commit '6682183b' into manualmerge ...

Conflicts:
	core/res/res/values/public.xml

Change-Id: Ic91db6ee85dcd8a6b13716b600b04c78ceac4b33

2014-06-01 16:44:28 -07:00

api

Merge commit '6682183b' into manualmerge

2014-06-01 16:44:28 -07: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 commit '6682183b' into manualmerge

2014-06-01 16:44:28 -07:00

data

Merge "Add layout for OnLive controller with USB adapter"

2014-05-30 19:27:38 +00:00

docs

am 38bb601e: am 305f3e21: am 79d3b623: am b9c5af3a: Merge "docs: Removed reference to draft apps." into klp-docs

2014-05-30 22:48:15 +00:00

drm

…

graphics

Merge commit '6682183b' into manualmerge

2014-06-01 16:44:28 -07:00

include

camera2: Plumb DngCreator to native library.

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

keystore

…

libs

am ea5af639: Merge "Re-jigger layers" into lmp-preview-dev

2014-05-30 21:39:04 +00:00

location

…

media

am bfea31fd: VolumeZen: Prevent raising ringer volume in silent mode.

2014-06-01 15:59:47 +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

…

opengl/java

opengl: Un-hide GLES31 and GLES31Ext classes

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

packages

am bfea31fd: VolumeZen: Prevent raising ringer volume in silent mode.

2014-06-01 15:59:47 +00:00

policy

am 698c8194: Merge "Fade scrim in unlock animation." into lmp-preview-dev

2014-05-31 01:56:15 +00:00

rs

Validate RenderScript context creation flags

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

samples/training/network-usage

…

sax

…

services

am 41e5f190: Merge "Add a path for generic event from a session to an application in Tv Input Framework." into lmp-preview-dev

2014-06-01 23:13:44 +00:00

telecomm/java

Allow ConnectionService to ask Telecomm for ringback

2014-05-31 11:19:54 -07:00

telephony/java

am 6d052adc: Merge "Update showCallScreen to use Telecomm (1/6)" into lmp-preview-dev

2014-05-30 21:38:54 +00:00

test-runner

am 9a78d4de: Merge "Per-app media directories on external storage." into lmp-preview-dev

2014-05-30 23:51:46 +00:00

tests

am d6f7d9b7: Merge "Clean up voice API." into lmp-preview-dev

2014-05-31 00:00:05 +00:00

tools

Per-app media directories on external storage.

2014-05-30 16:26:45 -07:00

wifi/java/android/net/wifi

Merge "add uid and debug fields to wifiConfiguration"

2014-05-31 01:08:38 +00:00

Android.mk

Restrictions Manager

2014-05-31 16:41:35 -07:00

CleanSpec.mk

DO NOT MERGE Cherry-pick: Fix build: CheckBuild line for removed wearable package

2014-05-25 19:37:39 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

…

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%