Kenny Root 2a14818810 am c738d55c: resolved conflicts for merge of 3e320a0c to master ...

* commit 'c738d55cd082fe35c1d6d3e2c67b4187c4c4c94e':
  Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()

2014-04-30 16:38:00 +00:00

api

am 8721a548: Merge "Add mechanism for Transitions to target a class."

2014-04-29 21:33:28 +00:00

cmds

Fix x86 build in app_process.

2014-04-30 16:45:07 +01:00

core

am 50642dc0: Merge "Fix NPE when going "back" from Activity Transition."

2014-04-30 14:30:29 +00:00

data

Move key attribute information into KeyEvent.

2014-04-28 14:33:40 -07:00

docs

am 86318b7d: am 0c18705b: am 3fef8e60: am 1053b2c5: Merge "Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html" into klp-docs

2014-04-28 23:11:36 +00:00

drm

Fix a few more stray libcore.io references.

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

graphics

Pull out dirty bounds before nulling ripples

2014-04-28 11:22:40 -07:00

include

am 97175deb: am 3856a219: am cecfb94f: Merge "Clean up argc / argv processing for runtime args."

2014-04-09 14:06:10 +00:00

keystore

Use the correct package name for CHOOSER

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

libs

Merge "RenderThread animator support"

2014-04-29 17:56:04 +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 "Add CHANNEL_OUT_QUAD_SIDE and CHANNEL_OUT_5POINT1_SIDE"

2014-04-29 16:14:43 +00:00

native

Bug fix for wakeup sensors.

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

nfc-extras

…

obex

…

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 68fb7b84: Merge "NotificationRowLayout shall rest in its grave."

2014-04-30 13:56:57 +00:00

policy

Move key attribute information into KeyEvent.

2014-04-28 14:33:40 -07:00

rs

am fc45b664: am f0aa4cc0: am a4898534: Merge "Fix improper use of JNI_ABORT for operations where Java objects are written."

2014-04-17 23:33:54 +00:00

samples/training/network-usage

…

sax

…

services

Fix broken trust agent reloading

2014-04-30 17:48:18 +02:00

telecomm/java

Merge "Add toString to CallServiceDescriptor" into master-nova

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

telephony/java

am e9c9547e: am c79963c3: am 1c1827a6: am 3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error"

2014-04-26 00:35:49 +00:00

test-runner

am 9e99cab7: am 970417c7: Added getLeanbackLaunchIntentForPackage()

2014-04-11 19:01:21 +00:00

tests

RenderThread animator support

2014-04-29 10:42:11 -07:00

tools

Merge "Add special system view cookie to OverflowButton."

2014-04-29 19:54:25 +00:00

wifi/java/android/net/wifi

am 72358802: am 45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev

2014-04-17 21:57:12 +00:00

Android.mk

am c60f1877: Merge "Rework some of the voice interaction APIs."

2014-04-28 20:37:33 +00:00

CleanSpec.mk

Add cleanspec for media Session apis.

2014-04-18 14:48:24 -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%