Adam Powell b9eab6c793 resolved conflicts for merge of 81cd2e90 to master ...

Fixed public.xml value padding for kraken/master

Merge commit '81cd2e90' into manualmerge

Conflicts:
	api/current.xml

Change-Id: I09d2c5c7e6acbf4086c0bb8756a5aaf41a646d71

2010-04-23 16:49:54 -07:00

api

resolved conflicts for merge of 81cd2e90 to master

2010-04-23 16:49:54 -07:00

awt

Add correct copyright headers to multiple files

2010-03-11 18:22:10 -08:00

build

…

camera

Still do dump() if we cannot get mServiceLock for a while.

2010-03-05 15:21:02 -08:00

cmds

add execution permission to "input" script

2010-04-15 10:58:48 -07:00

common

Move the public method HttpDateTime.parse() into AndroidHttpClient.

2010-04-09 13:34:15 -07:00

core

resolved conflicts for merge of 81cd2e90 to master

2010-04-23 16:49:54 -07:00

data

final versions of these fonts from ascender, including GPOS 'mark' feature

2010-04-09 15:12:19 -04:00

docs

SDK: new 'bmgr' docs in the Dev Guide

2010-04-21 17:00:53 -07:00

graphics

update dox for FILL_AND_STROKE style

2010-04-14 14:46:46 -04:00

icu4j

Refactor Styled utility functions into reusable objects.

2010-04-07 14:54:51 -07:00

include

better fix for [2420565] Surface.lockCanvas() updates the dirty region too often

2010-04-21 22:25:35 -07:00

keystore

Don't rely on the system locale for converting to/from bytes.

2010-03-10 11:25:53 -08:00

libs

am 9bce8737: more surfaceflinger cleanups

2010-04-21 22:40:21 -07:00

location

GpsStatus: Bounds check PRN to avoid array indexing exceptions.

2010-04-14 19:38:26 -04:00

media

am 460587e9: am f6adae78: am 47dad8fa: Merge "Fix bug 2619062 Music is routed to Phone speaker, though it is connected to A2DP media profile" into froyo

2010-04-23 15:00:29 -07:00

native

…

obex

Add ABORT support to Obex lib

2010-03-16 09:59:06 -07:00

opengl

am 15d484a7: am 06798769: am 7305f416: Merge "Quietly handle EGL_BAD_NATIVE_WINDOW errors" into froyo

2010-04-19 19:24:19 -07:00

packages

am a298d6fd: am a2a568e5: Merge "Fix error code when media is filled up." into froyo

2010-04-22 15:57:34 -07:00

policy

am 318249e4: Merge "Manual merge of Ida6a4cdd3abcbcab7e2fe8450a25c0dc36765f04" into kraken

2010-04-15 18:01:32 -07: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 81cd2e90 to master

2010-04-23 16:49:54 -07:00

telephony

am d54c48b2: am 9666bbdf: am 7b88af67: Merge "bug #2618035: applying Moto\'s patch to fix a email/shortcode parsing bug." into froyo

2010-04-22 16:47:17 -07:00

test-runner

Logo attribute for manifest and PackageManager methods to fetch it

2010-04-23 15:49:07 -07:00

tests

Updates DumpRenderTree ignore list to reflect status of touch event tests at current WebKit revision (r54731).

2010-04-23 13:34:00 -07:00

tools

Fix aapt to build in Windows SDK under Linux

2010-04-16 17:59:09 -07:00

vpn

DO NOT MERGE

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

wifi/java/android/net/wifi

Reset notification state on wifi enable

2010-04-18 23:07:01 -07:00

Android.mk

disable emma instrumentation for framework, ext and services

2010-04-20 13:39:49 -07:00

CleanSpec.mk

Finish moving the policies out of frameworks/policies/base and into frameworks/base.

2010-04-06 20:21:30 -05:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

am f9e90378: am bc284a5f: Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo

2010-04-10 11:47:45 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%