Deepanshu Gupta cd9e9f4b43 am 74e14827: am 492090a5: (-s ours) am 16191f8c: resolved conflicts for merge of 0e2049cd to klp-modular-dev ...

* commit '74e14827cff43fee85970724ea9e4850316d2e11':
  Layoutlib tests now check methods return value [DO NOT MERGE]

2014-04-16 19:45:17 +00:00

api

am 8b53023a: Merge "Fix action bar theme inheritance and icons, make colors public"

2014-04-16 01:29:08 +00:00

cmds

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

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

core

am 34de7a83: Merge "Stub APIs for network scoring."

2014-04-16 19:10:07 +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

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

Update DrmOutputStream to use raw FileDescriptor.

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

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

Injected settings no longer include summaries

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

media

am 5c04c4e7: am 6ced3b34: am 0d54e471: Merge "Remove code markers"

2014-04-15 23:36:27 +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

Clean up dist files.

2013-05-21 12:38:22 -07:00

obex

Fixed review comments

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

opengl/java

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

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

packages

Merge "Revert "Import translations. DO NOT MERGE""

2014-04-16 16:10:08 +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

cherrypick from ics-mr1 docs: source for nw app Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2

2012-08-08 11:27:09 -07:00

sax

Remove unused imports from frameworks/base.

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

services

Merge "Rename basePkg to opPkg"

2014-04-16 17:37:20 +00:00

telecomm/java

Merge "Add toString to CallServiceDescriptor" into master-nova

2014-04-15 18:41:37 +00: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

Original DnsSd TxtRecord file

2012-04-04 11:37:35 -07:00

preloaded-classes

Remove non-existent classes from preloaded-classes

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

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%