Brad Fitzpatrick 96fd5af681 resolved conflicts for merge of 0b7b9807 to master ...

Change-Id: If60aeeb47cd06dcc76b88506688c7e4b58cf2208

2010-08-24 12:40:13 -07:00

api

resolved conflicts for merge of b037da40 to master

2010-08-24 11:48:37 -07:00

awt

Add correct copyright headers to multiple files

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

build

auto import from //depot/cupcake/@135843

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

cmds

On-device screenshot support.

2010-08-20 09:42:49 -04:00

core

resolved conflicts for merge of 0b7b9807 to master

2010-08-24 12:40:13 -07:00

data

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

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

docs

am 976b71e2: am afdc85f6: am 397c0f5a: Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo

2010-08-24 11:54:39 -07:00

graphics

am 5a14271a: am d6f7f225: Merge "Load bitmaps in the correct format." into gingerbread

2010-08-24 10:15:51 -07:00

icu4j

Refactor Styled utility functions into reusable objects.

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

include

am 28a92120: am 3f51fa78: Runtime dump support for MediaWriter

2010-08-24 11:20:40 -07:00

keystore

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

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

libs

resolved conflicts for merge of 485de781 to master

2010-08-24 09:57:33 -07:00

location

Add new system service CountryDetector

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

media

am 31e71131: am 3e22ef1e: Merge "Better handling of rtsp connection and disconnection." into gingerbread

2010-08-24 11:20:57 -07:00

native

resolved conflicts for merge of 485de781 to master

2010-08-24 09:57:33 -07:00

obex

Add ABORT support to Obex lib

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

opengl

am b3aaf3ba: am bccfcd95: Merge "fix [2931718] glDrawArrays skips a triangle when more than 70 vertices are used." into gingerbread

2010-08-21 09:42:53 -07:00

packages

am 36c051c7: am a695cbc9: am 0fe27cf5: make android_id random seed depend on time as well as ro.serialno

2010-08-21 09:43:58 -07:00

policy

More ActionBar/config change tweaks. Preserve open overflow menus

2010-08-23 10:24:49 -07:00

sax

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

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

services

am 6e549d1c: am f467ca08: Merge "More watermark work." into gingerbread

2010-08-24 11:54:49 -07:00

telephony

am 360ab1df: am 6864b3e2: Merge "Adds the ability to Android to initiate a 2 Digit Call."

2010-08-24 11:21:59 -07:00

test-runner

Add new ContentProvider for doing conversions to data streams.

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

tests

Merge WebKit at r65615 : Ignore http/tests/appcache/origin-quota.html

2010-08-24 12:15:54 +01:00

tools

am 8b569c8d: am 42f90ca5: Merge "Fix aapt dump badging to support xlarge screens." into gingerbread

2010-08-24 09:02:43 -07:00

voip

RTP: fix few leaks when fail to add streams into a group.

2010-08-19 18:26:53 +08:00

vpn

DO NOT MERGE

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

wifi/java/android/net/wifi

cache configured networks

2010-08-23 16:32:24 -07:00

Android.mk

am 63f05fe4: am bb75aa90: am ca9d51b1: Disabling AccessibilityService sample from build system.

2010-08-24 11:01:02 -07:00

CleanSpec.mk

resolved conflicts for merge of 485de781 to master

2010-08-24 09:57:33 -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

New API and implementation of DB and memory-backed FDs

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

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%