Jeff Brown 047f3c71a4 resolved conflicts for merge of 3ee9dc58 to master ...

Change-Id: Idd045d01246367b77718210c8b6665110da58ac4

2014-04-16 14:18:49 -07:00

api

resolved conflicts for merge of 3ee9dc58 to master

2014-04-16 14:18:49 -07:00

cmds

Add 'read' subcommand to the 'content' tool.

2014-04-15 19:28:08 -04:00

core

resolved conflicts for merge of 3ee9dc58 to master

2014-04-16 14:18:49 -07: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

am 45f232cf: am 7ba3b3f4: am fe0996b7: am 60095240: docs: Updated the gradle build number to 4.3.23. Bug: 14043082

2014-04-15 23:36:13 +00:00

drm

…

graphics

Implement jumpToCurrentState() in VectorDrawable

2014-04-15 15:53:01 -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

…

media

Merge "media: don't rely on Java 6 parseInt error on leading '+' sign"

2014-04-16 20:47:40 +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

Merge "Fix NPE if showKeyguard() is not called before hideKeyguard()."

2014-04-16 20:32:58 +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

am 4b81e89d: am 2fd3cb95: Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev

2014-04-16 20:13:09 +00:00

telephony/java

Add LISTEN_DATA_CONNECTIPON_REAL_TIME_INFO as listen event

2014-04-15 22:04:10 -07: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

am 16191f8c: resolved conflicts for merge of 0e2049cd to klp-modular-dev

2014-04-16 19:20:01 +00:00

wifi/java/android/net/wifi

Merge "Revert "Refactor IpConfiguration from WifiConfiguration""

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

Android.mk

Merge "Adding render stats APIs to UiAutomation (framework)."

2014-04-10 19:32:59 +00:00

CleanSpec.mk

Initial round of Television Input Framework

2014-04-08 13:35:21 -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%