Jeff Brown 08965fc730 resolved conflicts for merge of 4e14159a to master ...

Change-Id: I42dc1efc2218af326a826aeb16daded71722b363

2010-08-11 18:00:34 -07:00

api

ActionBar overlay mode, height fetching, show/hide

2010-08-11 16:17:57 -07:00

awt

Add correct copyright headers to multiple files

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

build

…

cmds

Add support for playing a sound before/after dumpstate.

2010-08-06 14:58:34 -07:00

core

resolved conflicts for merge of 4e14159a to master

2010-08-11 18:00:34 -07:00

data

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

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

docs

am c9de8c34: am 97c2d840: am 8dd87ad9: fix some doc errors in the resources; add link to resource docs for ColorStateList class

2010-08-05 12:08:02 -07:00

graphics

Merge "Fix crash in Market."

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

icu4j

Refactor Styled utility functions into reusable objects.

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

include

am f66f8a58: am 95af0c14: Merge "Add support for the PointerLocation overlay." into gingerbread

2010-08-11 16:22:47 -07:00

keystore

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

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

libs

Merge "Delete shaders after a compile error. Also disable extra logging."

2010-08-11 16:40:28 -07:00

location

Add new system service CountryDetector

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

media

Merge "Call startPreview after stopping for mUseStillCameraForTimeLapse=true case."

2010-08-11 14:17:19 -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 553a333d: am 603a34ee: Merge "improve a bit the implementation of eglGetProcAddress" into gingerbread

2010-08-10 13:55:34 -07:00

packages

am f5ee5358: am ac9717ab: Merge "Move OBB file reading to DefaultContainerService" into gingerbread

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

policy

Merge "ActionBar overlay mode, height fetching, show/hide"

2010-08-11 17:26:10 -07:00

sax

…

services

am 5744cd6a: am 90dc48b1: Merge "call into hwcomposer HAL when present" into gingerbread

2010-08-11 16:30:13 -07:00

telephony

am 371dbcba: am c4c4c98c: In CW Interrogation service class is not sent.

2010-08-11 09:56:05 -07:00

test-runner

Add new ContentProvider for doing conversions to data streams.

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

tests

Merge "Added a basic version of python script and supporting code in DumpRenderTree."

2010-08-11 05:26:38 -07:00

tools

am 80328ba0: am 8ea71511: Merge "Initial tool for OBB manipulation" into gingerbread

2010-08-11 14:15:20 -07:00

voip

SipAudioCall: perform local ops before network op in endCall()

2010-08-10 13:23:12 +08:00

vpn

DO NOT MERGE

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

wifi/java/android/net/wifi

Fix build

2010-08-11 08:20:41 -07:00

Android.mk

am f5ee5358: am ac9717ab: Merge "Move OBB file reading to DefaultContainerService" into gingerbread

2010-08-11 14:15:10 -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

resolved conflicts for merge of 1b7e4d5a to master

2010-08-05 14:02:36 -07:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%