Jean-Baptiste Queru 2338f48ddb resolved conflicts for merge of 34df5ccc to master ...

Change-Id: I55558b2ab9452b2a819a1fce5b3ee5af29688e98

2010-08-20 06:18:50 -07:00

api

am 03805f72: am d313cab4: Merge "tracking merge of external/apache-http from dalvik-dev" into gingerbread

2010-08-18 14:22:08 -07:00

awt

Add correct copyright headers to multiple files

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

build

…

cmds

am 18dd95f4: am 05b20c03: Merge "bootanimation: Don\'t open non-existing bootanimation.zip"

2010-08-17 07:51:40 -07:00

core

Merge "Fixing the SDK build"

2010-08-19 16:32:31 -07:00

data

am cbbc035b: am de1057c4: Unhide new API for supporting multiple cameras.

2010-06-27 20:54:36 -07:00

docs

am 1ef758b8: am 404bffbe: am 4f3c5372: Merge "Fix subscribe links for Developer Forums doc." into froyo

2010-08-12 14:36:35 -07:00

graphics

Merge "Load assets in place instead of deferring until draw."

2010-08-19 14:44:52 -07:00

icu4j

Refactor Styled utility functions into reusable objects.

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

include

am 33992d41: am 72e0b2ab: Merge "Fix some input device mapping bugs with certain drivers." into gingerbread

2010-08-19 23:43:19 -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 33992d41: am 72e0b2ab: Merge "Fix some input device mapping bugs with certain drivers." into gingerbread

2010-08-19 23:43:19 -07:00

location

Add new system service CountryDetector

2010-07-28 09:45:57 +08:00

media

am 00557baf: am 4dda6ddb: Merge "Make the OggExtractor less verbose." into gingerbread

2010-08-18 14:21:57 -07:00

native

am 679ac09a: am a5ae50cd: Merge "More native work." into gingerbread

2010-08-11 00:50:56 -07:00

obex

Add ABORT support to Obex lib

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

opengl

am a4ed1c67: am 1e4aa48c: Merge "fix [2912927] Can\'t get NV_draw_path extension to work" into gingerbread

2010-08-16 07:49:24 -07:00

packages

Merge "Import Romansh translations."

2010-08-19 12:00:34 -07:00

policy

Back button closes ActionModes

2010-08-18 11:59:16 -07:00

sax

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

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

services

asynchronous driver commands

2010-08-19 12:23:13 -07:00

telephony

Merge "Move the "voice_capable" resource into the framework."

2010-08-18 14:32:36 -07:00

test-runner

Add new ContentProvider for doing conversions to data streams.

2010-08-08 18:49:31 -07:00

tests

Update OpenGLRenderer test to test opaque ARGB8888 bitmaps.

2010-08-19 14:45:42 -07:00

tools

am 8cfd3c01: am e05184f2: Merge "Output proguard keep flags for fragment classes." into gingerbread

2010-08-16 15:16:52 -07:00

voip

Fix the IN_CALL mode issue.

2010-08-16 18:02:31 +08:00

vpn

Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources.

2010-01-29 13:35:51 -08:00

wifi/java/android/net/wifi

resolved conflicts for merge of 34df5ccc to master

2010-08-20 06:18:50 -07:00

Android.mk

Explicit warning level for deprecation mismatch

2010-08-19 14:24:45 -07:00

CleanSpec.mk

Make libhwui entirely optional.

2010-08-08 17:45:07 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

Adding PacketVideo attribution in NOTICE.

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

preloaded-classes

New API and implementation of DB and memory-backed FDs

2010-08-18 15:39:52 +01:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%