Jean-Baptiste Queru 4a88013a4a resolved conflicts for merge of bf1439c5 to stage-korg-master ...

Change-Id: Iab543a7ee449025f1df5d58afaa8f8fdd4809c99

2010-12-02 15:16:53 -08:00

api

am d9334934: Merge "Update of DRM Framework."

2010-11-22 21:25:56 -08:00

build

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

cmds

Merge from open-source master

2010-12-02 07:55:06 -08:00

core

am c1c04ad0: Merge "Add Wi-Fi tests for static IP. DO NOT MERGE" into gingerbread

2010-11-24 13:29:56 -08:00

data

am 80381ab4: Merge "DO NOT MERGE - Updated ringtones for Crespo, fixing looping problem" into gingerbread

2010-11-18 15:06:51 -08:00

docs

am 93116f8f: am 3577f51d: docs: clarify <include> layout properties bug: 3227820

2010-11-24 12:43:08 -08:00

drm

Update of DRM Framework.

2010-11-19 22:02:51 +09:00

graphics

am eb6e22f2: Merge "Document Bitmap.createScaledBitmap" into gingerbread

2010-10-04 12:23:58 -07:00

include

am d9334934: Merge "Update of DRM Framework."

2010-11-22 21:25:56 -08: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

am f0f6c54b: Merge "frameworks/base: Destroy the overlay even if there is an error"

2010-11-23 11:14:57 -08:00

location

Remove old location classes.

2010-09-28 17:50:50 -07:00

media

Fix HTTP redirect missing statuscode 303 and 307

2010-11-29 15:59:12 +01:00

native

add format parameter to setBufferGeometry

2010-10-25 15:58:35 -07:00

obex

Bluetooth OBEX timeout problem.

2010-10-27 08:38:30 +02:00

opengl

am 17fd21fc: Merge "DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions" into gingerbread

2010-11-10 14:15:57 -08:00

packages

Merge "Squash ANRs in UsbStorageActivity." into gingerbread

2010-11-03 17:08:03 -07:00

policy

Revert "allow all 4 orientations"

2010-11-13 22:02:13 -08:00

sax

Re-arrange android-common so framework no longer links with it.

2010-02-25 11:39:33 -08:00

services

resolved conflicts for merge of bf1439c5 to stage-korg-master

2010-12-02 15:16:53 -08:00

telephony

resolved conflicts for merge of e4ae7fc3 to gingerbread-plus-aosp

2010-11-22 16:32:34 -08:00

test-runner

am e3bef7c4: Merge "Added noop unregisterReceiver to complement existing noop registerReceiver."

2010-11-19 15:43:28 -08:00

tests

am ba501785: Merge "Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread

2010-10-21 20:17:56 -07:00

tools

am 5580e44c: Merge "Support changing style parent in overlays"

2010-11-05 14:05:41 -07:00

voip

docs: revise javadocs for sip

2010-10-28 16:37:43 -07:00

vpn

DO NOT MERGE

2010-03-29 18:12:24 -07:00

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

Revert "Disabling AccessibilityService sample from build system."

2010-11-24 16:03:21 -08:00

CleanSpec.mk

Cleanspec to fix incremental build failures of the form:

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

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

NOTICE

Adding PacketVideo attribution in NOTICE.

2010-05-06 14:15:47 -07:00

preloaded-classes

This class no longer exists.

2010-11-04 16:17:52 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%