Jeff Brown ae9bf8dd42 resolved conflicts for merge of 6a1a2f9b to master ...

Change-Id: Ie204a484b9b989a66423b756bb4743d7018c0884

2013-11-07 21:25:26 -08:00

api

Merge "Add methods for removing children and actions from A11y nodes"

2013-11-07 23:34:08 +00:00

cmds

am 8f592378: am 69920427: Merge "Fix a variety of small publicly-reported bugs."

2013-10-29 13:35:04 -07:00

core

Merge "Disable unused parameter warning for jni code"

2013-11-08 02:39:39 +00:00

data

am 86271499: am f2194693: am 371427b5: Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode."

2013-11-04 21:59:19 -08:00

docs

am cbc0a6c3: am 347b6fc9: Doc change: remove a reference to RTL pseudolocale.

2013-11-07 09:31:01 -08:00

drm

Revert "Enhancement for OnInfo callback on DRM Framework"

2013-09-03 10:13:17 -07:00

graphics

am ebd616e8: am 134631b9: am 90242fe5: Merge "Switch to the new Skia PDF generation APIs." into klp-dev

2013-11-07 16:28:39 -08:00

include

move libandroidfw to frameworks/native

2013-10-03 10:30:18 -07:00

keystore

Add argument to binder call to check key types

2013-09-10 18:49:40 +00:00

libs

am 2f70da2b: am 6ed16a89: am 0b807d2e: Merge "Update the layer\'s alpha value upon composition of the layer"

2013-11-06 16:15:38 -08:00

location

Improve some javadoc related to isProviderEnabled() apis

2013-09-11 11:03:03 -07:00

media

am c2b652fd: am 5182ea4b: am d40a4d74: Merge "Add media router service and integrate with remote displays." into klp-dev

2013-11-07 17:47:25 -08:00

native

Move input library code to frameworks/native.

2013-07-01 20:11:42 -07: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

Regenerate all the OpenGL stubs.

2013-09-24 17:15:41 -07:00

packages

resolved conflicts for merge of 6a1a2f9b to master

2013-11-07 21:25:26 -08:00

policy

am 9f6e8e03: am 94cab389: am 1e45fd78: Merge "Fix improperly hidden status bar." into klp-dev

2013-11-07 16:54:08 -08:00

samples/training/network-usage

…

sax

…

services

am c2b652fd: am 5182ea4b: am d40a4d74: Merge "Add media router service and integrate with remote displays." into klp-dev

2013-11-07 17:47:25 -08:00

telephony/java

Add PhoneNumberUtils method for CDMA SMS number formatting.

2013-11-04 15:22:55 -08:00

test-runner

Set mServiceCreated to false when onDestroy().

2013-10-22 17:39:37 +01:00

tests

am c2b652fd: am 5182ea4b: am d40a4d74: Merge "Add media router service and integrate with remote displays." into klp-dev

2013-11-07 17:47:25 -08:00

wifi/java/android/net/wifi

resolved conflicts for merge of c3eef190 to master

2013-11-07 15:05:26 -08:00

Android.mk

am c2b652fd: am 5182ea4b: am d40a4d74: Merge "Add media router service and integrate with remote displays." into klp-dev

2013-11-07 17:47:25 -08:00

CleanSpec.mk

am 5c880d0d: am 6f688e87: am 8f34715b: Merge "Refactor how the print dialog activity is started." into klp-dev

2013-10-11 10:11:05 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Remove old WebView classes from zygote preload list.

2013-10-15 10:45:18 +01:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%