Elliott Hughes 4b0ee78bfa resolved conflicts for merge of 56ca8219 to master ...

Change-Id: I62f5804a5c4404eedce09188cda2e3b1bb990b36

2014-04-18 16:07:41 -07:00

api

Merge "Add convenience methods to encourage usage of ALL_SAVE_FLAG"

2014-04-18 20:09:56 +00:00

cmds

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

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

core

Fixed a typo implying intents must and must not be explicit.

2014-04-18 22:45:27 +00:00

data

Add Fire TV remote key layout.

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

docs

am 235fd3c9: am d5ed804f: am a7b62718: am 974588d1: Merge "docs: Watermarked images for codes that weren\'t found." into klp-docs

2014-04-18 19:20:04 +00:00

drm

Update DrmOutputStream to use raw FileDescriptor.

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

graphics

Merge "Add convenience methods to encourage usage of ALL_SAVE_FLAG"

2014-04-18 20:09:56 +00: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

Force a full redraw on surface change

2014-04-17 20:27:37 -07:00

location

Injected settings no longer include summaries

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

media

am ef059b03: am 3c8bbe24: Check that mRemotePlayer is not null before use

2014-04-17 22:59:55 +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 "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."

2014-04-18 18:13:09 +00:00

policy

am 03f7f442: am cb54f978: Merge "Update window alpha at the same time as translating" into klp-modular-dev

2014-04-17 23:33:33 +00: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

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 "Support per-package lib dirs for bundled apps"

2014-04-18 00:02:44 +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

resolved conflicts for merge of 56ca8219 to master

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

Add RouteProviders to the new Media APIs

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

CleanSpec.mk

Add cleanspec for media Session apis.

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