Kenny Root 027610a76e resolved conflicts for merge of 964eb438 to master ...

Change-Id: I0c54d6b88356d8734d7f51234b0114434414502e

2010-10-18 13:03:35 -07:00

api

resolved conflicts for merge of 964eb438 to master

2010-10-18 13:03:35 -07:00

build

…

cmds

Remove one more opencore include path

2010-10-18 08:41:14 -07:00

core

resolved conflicts for merge of 964eb438 to master

2010-10-18 13:03:35 -07:00

data

Add keycodes and meta-key modifiers to support external keyboards.

2010-10-15 16:00:07 -07:00

docs

am 81df9841: am 2c1dab44: am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo

2010-10-17 13:49:45 -07:00

drm

Update of DRM framework.

2010-10-04 22:14:53 +09:00

graphics

Fix object cast.

2010-10-14 17:57:30 -07:00

icu4j

…

include

am 746c6a1c: am ff7a7a45: Merge "Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore." into gingerbread

2010-10-18 08:05:09 -07:00

keystore

Work on issue #3101415: Crespo apps seem to have their UID changed over time.

2010-10-15 14:46:33 -07:00

libs

Adding new unit test for rsDebug().

2010-10-18 12:17:03 -07:00

location

am cb51c0c7: am 3e94b94f: Merge "Remove old location classes." into gingerbread

2010-09-28 18:24:48 -07:00

media

Fix build (bad merge)

2010-10-18 08:47:03 -07:00

native

Add keycodes and meta-key modifiers to support external keyboards.

2010-10-15 16:00:07 -07:00

obex

…

opengl

libagl: eglSwapInterval fix

2010-10-06 16:44:37 -07:00

packages

Allow notifications to not specify a contentIntent.

2010-10-13 17:29:26 -07:00

policy

Add support for secure system overlays.

2010-10-15 17:10:55 -07:00

sax

…

services

resolved conflicts for merge of 964eb438 to master

2010-10-18 13:03:35 -07:00

telephony

am e3c50a54: am cebe5b2e: Merge "Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)" into gingerbread

2010-10-15 13:40:16 -07:00

test-runner

Allow all apps to call ContentResolver.getType().

2010-09-27 18:05:44 -07:00

tests

Merge changes I4a85ff69,Idba4acc2

2010-10-18 12:23:28 -07:00

tools

am 35d34c67: am 3d828e62: Merge "Do not build pbkdf2gen on non-Linux hosts" into gingerbread

2010-10-15 14:25:59 -07:00

voip

am ebad42d6: am 3fbfee2f: Merge "SipService: add wake lock for incoming INVITE packets." into gingerbread

2010-10-16 09:01:04 -07:00

vpn

…

wifi/java/android/net/wifi

am 4e08a985: Merge "fix build DO NOT MERGE" into gingerbread

2010-10-15 18:24:37 -07:00

Android.mk

NFC API revision round 2.

2010-10-14 19:16:35 -07:00

CleanSpec.mk

NFC API revision round 2.

2010-10-14 19:16:35 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

resolved conflicts for merge of 8b1082bb to master

2010-10-15 13:10:01 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%