Adam Lesinski 350159c65a resolved conflicts for merge of 6984e4f9 to master ...

Conflicts:
	services/core/java/com/android/server/notification/NotificationManagerService.java

Change-Id: Ief1bf339cf7d75094c9a169264c015b1f286ed63

2014-03-27 18:26:11 +00:00

api

Merge "Add a mediastore constant for playlists."

2014-03-27 15:43:19 +00:00

cmds

Merge "Revert "Expand install observer semantics""

2014-03-26 20:00:11 +00:00

core

Merge "Add a mediastore constant for playlists."

2014-03-27 15:43:19 +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 68d43e27: am b5e754dd: am 8ea583a7: am f9943d0e: Merge "add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29" into klp-docs

2014-03-27 09:37:47 +00:00

drm

Update DrmOutputStream to use raw FileDescriptor.

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

graphics

Merge "Separate ripple animation logic, remove RevealDrawable"

2014-03-27 00:31:53 +00:00

include

Shared library resource support

2014-03-25 12:09:56 -07:00

keystore

Use the correct package name for CHOOSER

2014-03-17 16:21:56 -07:00

libs

Merge "Async drawing!"

2014-03-27 17:11:31 +00:00

location

Injected settings no longer include summaries

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

media

Merge "Continue refactoring MediaFocusControl"

2014-03-26 21:00:46 +00:00

native

Cleanup unnecessary includes for libskia.

2014-02-27 16:21:24 +00:00

nfc-extras

…

obex

…

opengl/java

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

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

packages

Improved integration of NotificationStackScroller

2014-03-27 18:18:49 +01:00

policy

Implement APIs for obtaining, caching themed Drawables

2014-03-24 18:00:26 -07:00

rs

am 4f346bf0: am ff1e1d99: am 240d5638: am c1f3d4c1: Merge "Fix 64 bit compile failures in renderscript"

2014-03-19 21:22:06 +00:00

samples/training/network-usage

…

sax

Remove unused imports from frameworks/base.

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

services

resolved conflicts for merge of 6984e4f9 to master

2014-03-27 18:26:11 +00:00

telephony/java

resolved conflicts for merge of c1edfc2c to master

2014-03-25 13:39:55 -07:00

test-runner

Revert "Expand install observer semantics"

2014-03-26 19:59:48 +00:00

tests

Merge "add Dynamic Drawable (vector graphics for Icons)"

2014-03-27 00:14:14 +00:00

tools

Shared library resource support

2014-03-25 12:09:56 -07:00

wifi/java/android/net/wifi

am e8af5e10: am 6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev

2014-03-11 17:44:20 +00:00

Android.mk

Merge "Revert "Expand install observer semantics""

2014-03-26 20:00:11 +00:00

CleanSpec.mk

Added accessibility APIs for introspecting interactive windows.

2014-03-20 16:52:59 +00: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%