Gilles Debunne cdfe899991 Fix for multiple merge problem. ...

Change-Id: I5d9c497f44aa9cdc34c195c41e02c3d7353c3fb4

2011-02-04 16:50:01 -08:00

api

Final final final Gingerbread MR API changes.

2011-02-01 09:20:45 -08:00

build

…

cmds

Squash commits of the following patches, cherry-picked from other branch - do not merge.

2011-01-12 17:12:46 -08:00

core

Fix for multiple merge problem.

2011-02-04 16:50:01 -08:00

data

…

docs

cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91

2011-02-03 15:22:54 -08:00

graphics

Do not merge.

2011-01-11 22:54:10 -08:00

include

do not merge bug 3370834 Cherrypick from master

2011-01-26 11:20:01 -08:00

keystore

…

libs

Merge from open-source gingerbread

2011-01-30 15:30:03 -08:00

location

…

media

DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.

2011-01-28 09:58:11 -08:00

native

Flush Binder commands in ndk looper.

2011-01-10 14:37:46 -08:00

obex

…

opengl

fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo

2010-12-08 15:34:02 -08:00

packages

Managed dialogs should run on the same thread as their activity.

2011-02-03 17:50:02 -08:00

policy

Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread

2011-01-27 18:22:14 -08:00

sax

…

services

Do not check features in PackageManagerService DO NOT MERGE

2011-01-31 16:27:38 -08:00

telephony

Merge from open-source gingerbread

2011-02-03 14:05:23 -08:00

test-runner

Remove API that snuck into MockPackageManager

2011-01-17 12:40:57 -08:00

tests

…

tools

GL texture filtering changed from AND to OR, so rename tag name to match.

2010-12-13 16:25:54 -08:00

voip

do not merge bug 3370834 Cherrypick from master

2011-01-26 11:20:01 -08:00

vpn

…

wifi/java/android/net/wifi

DO NOT MERGE Avoid nullifying dhcp target

2010-12-03 09:59:07 -08:00

Android.mk

enable preview mode for docs and add api level 10 flag for api level diffs

2011-01-26 18:29:50 -08:00

CleanSpec.mk

Rough first pass at the NFC technology API.

2010-11-19 20:26:29 -06:00

MODULE_LICENSE_APACHE2

…

NOTICE

Fix omission in NOTICE file.

2011-01-18 15:25:32 -08:00

preloaded-classes

…

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%