Robert Ly 8cbcd69514 am 141b3b9c: Merge "resolved conflicts for merge of 99c3605c to master" ...

* commit '141b3b9c5ff69c3c40d3709d90d81eaadc18240d':
  resolved conflicts for merge of 99c3605c to master

2014-04-15 16:20:10 +00:00

api

am 18769204: Merge "Add Quantum motion curve interpolators."

2014-04-15 14:41:27 +00:00

cmds

am 96457004: am 549ae327: am aa19a2f6: Merge "Don\'t compare String8s to NULL."

2014-04-14 15:49:25 +00:00

core

am 18769204: Merge "Add Quantum motion curve interpolators."

2014-04-15 14:41:27 +00:00

data

am d89929db: am c635ef99: am ec5b6e87: Merge "Add RobotoCondensed-Light to build." into klp-modular-dev

2014-03-25 21:36:39 +00:00

docs

resolved conflicts for merge of 99c3605c to master

2014-04-15 09:14:19 -07:00

drm

Update DrmOutputStream to use raw FileDescriptor.

2014-02-06 09:47:38 -08:00

graphics

Make sure control points are in absolute coordinates

2014-04-11 15:59:15 -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 "Fix issue with bitmap uploading"

2014-04-14 20:57:38 +00:00

location

Injected settings no longer include summaries

2014-03-03 10:30:36 -08:00

media

Merge "Implement USB Audio across Nexus Devices Fix issues with connecting non-audio USB devices."

2014-04-11 21:18:51 +00:00

native

am 8ebd66c2: am cd4c1c71: Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev

2014-04-11 19:40:31 +00:00

nfc-extras

…

obex

…

opengl/java

Revert "Revert "Workaround apps not calling super.onDetachedFromWindow()""

2014-03-06 14:12:35 -08:00

packages

am c5dc0d0c: Zoom notifications on lockscreen after tapping.

2014-04-15 16:00:28 +00:00

policy

am 26c6a50f: Rename isScreenOn() to isInteractive().

2014-04-11 09:24:24 +00:00

rs

am c796ccaa: am 095ece10: am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem"

2014-04-01 00:24:57 +00:00

samples/training/network-usage

…

sax

…

services

Sends ACTION_MANAGED_PROFILE_ADDED intent at foreground priority to speedup the new profile ui.

2014-04-15 10:59:18 +01:00

telecomm/java

Expose a method to cancel an outgoing call

2014-04-11 16:02:15 -07:00

telephony/java

am 7217f380: Correct some comments (LTE->CDMA)

2014-04-11 14:27:14 +00:00

test-runner

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

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

tests

resolved conflicts for merge of 381ac080 to master

2014-04-14 15:14:01 -07:00

tools

Merge "Add overflow menu popup for Action Bar in Layoutlib"

2014-04-14 23:07:59 +00:00

wifi/java/android/net/wifi

Merge "Revert "Refactor IpConfiguration from WifiConfiguration""

2014-04-07 09:01:43 +00:00

Android.mk

am 6be2f952: Merge "Adding render stats APIs to UiAutomation (framework)."

2014-04-10 19:36:27 +00:00

CleanSpec.mk

Initial round of Television Input Framework

2014-04-08 13:35:21 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Remove non-existent classes from preloaded-classes

2014-02-27 13:51:00 -08:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%