Justin Koh be4c2c2b99 resolved conflicts for merge of d90712d0 to master ...

Change-Id: Ia587476c001bce5f0969557b15d366aed6b322b1

2014-04-22 11:05:15 -07:00

api

Merge "Add overlay view in Tv Input Framework"

2014-04-22 00:29:49 +00:00

cmds

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

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

core

resolved conflicts for merge of d90712d0 to master

2014-04-22 11:05:15 -07:00

data

Add Fire TV remote key layout.

2014-04-18 14:24:12 -07:00

docs

am 97b7208f: am da1a10f7: am c68e2089: am 3555e4ae: Fixed a typo in a code sample.

2014-04-22 13:41:50 +00:00

drm

Update DrmOutputStream to use raw FileDescriptor.

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

graphics

Add touch feedback to edit text

2014-04-21 17:30:22 -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

Fix is_zero check

2014-04-22 10:09:03 -07:00

location

Injected settings no longer include summaries

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

media

Merge "MediaFocusControl: priority to playing players for media button"

2014-04-22 17:36:10 +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

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

Merge "Apply insets manually in StatusBarWindowView."

2014-04-22 17:22:26 +00:00

policy

resolved conflicts for merge of d90712d0 to master

2014-04-22 11:05:15 -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

Merge "Add config resource to add inital mock location providers"

2014-04-22 17:17:29 +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

Add RouteProviders to the new Media APIs

2014-04-17 15:02:33 -07:00

tools

am 36e64ab9: am cf4d85e4: am 90840ec2: Merge "Fix warning introduced by recent psuedolocalizer change."

2014-04-18 23:30:27 +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

Initial implementation of NetworkScoreManager's backing service.

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

CleanSpec.mk

Add cleanspec for media Session apis.

2014-04-18 14:48:24 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Removed android.debug.JNITest from preloaded-classes

2014-03-24 20:21:04 +00:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%