Chet Haase 4918e7ad66 resolved conflicts for merge of 09ed0720 to master ...

Change-Id: I1ce1b48a9fb954caf4fd15237f2f608ac9c478fe

2013-09-04 17:19:44 -07:00

api

resolved conflicts for merge of 09ed0720 to master

2013-09-04 17:19:44 -07:00

cmds

Fix check for default source in input command

2013-08-22 15:01:15 -07:00

core

resolved conflicts for merge of 09ed0720 to master

2013-09-04 17:19:44 -07:00

data

Merge "Fix keymap build dependencies and variable name collisions" into klp-dev

2013-09-04 22:37:05 +00:00

docs

am 966b9d46: am 002057bf: Merge "update dashboards for 9/13" into jb-mr2-docs

2013-09-04 15:40:27 -07:00

drm

Revert "Enhancement for OnInfo callback on DRM Framework"

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

graphics

am 9a160a52: am e182bfd4: Merge "Prevent NPE when cloning gradients Bug #10436856" into klp-dev

2013-09-03 16:38:55 -07:00

include

Clearly separate consumer and producer interfaces

2013-08-06 13:07:42 -07:00

keystore

Unhide functions to allow ECDSA support

2013-09-03 09:45:55 -07:00

libs

am 7ff37ada: am ff2c22e2: Merge "Move functor GL setup to just before functor" into klp-dev

2013-08-26 15:12:06 -07:00

location

Add LocationManager.MODE_CHANGED_ACTION broadcast

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

media

Merge "Java API for AudioTrack timestamps" into klp-dev

2013-09-04 22:29:19 +00: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

Bluetooth MAP profile - sms and mms support initial check-in

2013-08-09 15:01:07 -07:00

opengl/java

Merge "Fix wrapper equals()"

2013-06-24 17:42:25 +00:00

packages

am 7e0eecc4: am 9f8c2d22: Merge "Fix keymap build dependencies and variable name collisions" into klp-dev

2013-09-04 15:44:24 -07:00

policy

Merge "Rename hideybars constant to SYSTEM_UI_FLAG_IMMERSIVE." into klp-dev

2013-08-29 01:00:03 +00:00

samples/training/network-usage

…

sax

…

services

am 411af374: am dbb0b824: Merge "wifi-display: add a global setting to force WPS config method" into klp-dev

2013-09-04 15:14:32 -07:00

telephony/java

Merge commit '270226b0' into manualmerge

2013-08-29 14:57:08 -07:00

test-runner

Add CancellationSignal support to file operations.

2013-08-23 11:27:25 -07:00

tests

resolved conflicts for merge of 09ed0720 to master

2013-09-04 17:19:44 -07:00

wifi/java/android/net/wifi

Synchronize access to single supplicant path

2013-08-30 12:31:25 -07:00

Android.mk

am a5259f62: am f48416de: Merge "Reader mode NFC API: move to callback model." into klp-dev

2013-09-03 17:53:53 -07:00

CleanSpec.mk

resolved conflicts for merge of 09ed0720 to master

2013-09-04 17:19:44 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

am c40e46e8: am bfe1b801: Merge "Update preloaded-classes"

2013-07-30 14:10:43 -07:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%