Kenny Root b5a14f0fc9 resolved conflicts for merge of 1995a7de to master ...

Change-Id: I9915ae06d460696b24cbee935738267911baa580

2013-09-18 14:23:58 -07:00

api

resolved conflicts for merge of 1995a7de to master

2013-09-18 14:23:58 -07:00

cmds

Implement issue #10691359: Kill long-running processes

2013-09-16 14:05:34 -07:00

core

resolved conflicts for merge of 1995a7de to master

2013-09-18 14:23:58 -07:00

data

Merge "Remove obsolete assets from target /system/media/video/" into klp-dev

2013-09-14 00:07:44 +00:00

docs

am fe790af5: am 1e6c936e: Merge "Doc change: change initial quota limit for Google Play Developer API v1_1." into jb-mr2-docs

2013-09-17 09:23:21 -07:00

drm

…

graphics

am 2e4e9889: am 3490228e: Merge "Use a native buffer for decoding images." into klp-dev

2013-09-18 10:58:27 -07:00

include

Remove dependency on JNIHelp header side effects.

2013-09-10 20:47:43 -07:00

keystore

…

libs

resolved conflicts for merge of d97303a7 to master

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

location

Improve some javadoc related to isProviderEnabled() apis

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

media

am 30ba38ac: am bf143ff1: Merge "ImageReader: disable NV21 support" into klp-dev

2013-09-18 10:54:54 -07:00

native

…

nfc-extras

…

obex

Fixed review comments

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

opengl/java

…

packages

am fd4cf800: am 90701f1a: Merge "PAC Local Proxy to only receive lo connections" into klp-dev

2013-09-18 13:09:33 -07:00

policy

am c8d19b89: Merge "Update transient navigation confirmation wording & behavior" into klp-dev

2013-09-16 16:08:09 -07:00

samples/training/network-usage

…

sax

…

services

resolved conflicts for merge of 1995a7de to master

2013-09-18 14:23:58 -07:00

telephony/java

Fix issue #10688644: Java crash in com.android.phone:

2013-09-11 09:59:47 -07:00

test-runner

Add hidden API for querying available 'home' activities

2013-09-13 12:16:00 -07:00

tests

Replace wildcard imports with explicit imports

2013-09-13 14:22:36 -07:00

wifi/java/android/net/wifi

am 007c6c7d: am c06b1db2: Merge "Consider current EAP TLS configurations as \'valid\'" into klp-dev

2013-09-16 16:58:46 -07:00

Android.mk

am f9464838: am 312c495f: Merge "Guarantee that PAC Local Proxy owns Port" into klp-dev

2013-09-13 17:22:53 -07:00

CleanSpec.mk

am edc538a7: am 0f3e1487: Merge "Remove obsolete assets from target /system/media/video/" into klp-dev

2013-09-13 17:30:57 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Merge "Preparation for deleting WebViewClassic" into klp-dev

2013-09-11 17:59:42 +00:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%