Gloria Wang e3afc288dd resolved conflicts for merge of a8d7b747 to master ...

Change-Id: I8a4b72c9f9a10de8bbc285e00e2dd5cb9f498349

2010-11-03 11:39:04 -07:00

api

resolved conflicts for merge of a8d7b747 to master

2010-11-03 11:39:04 -07:00

build

auto import from //depot/cupcake/@135843

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

cmds

Don't crash bmgr if there are no available restore sets

2010-11-01 15:50:35 -07:00

core

am 6fb9316f: am 38e561dd: Merge "Remove timeout support." into gingerbread

2010-11-03 10:59:54 -07:00

data

Add plumbing for volume mute key.

2010-11-02 17:31:39 -07:00

docs

am fcea62a6: am c1fad4a2: Merge "DOC CHANGE: Add entry for monkeyrunner to tools index page." into gingerbread

2010-11-03 10:59:03 -07:00

drm

resolved conflicts for merge of a8d7b747 to master

2010-11-03 11:39:04 -07:00

graphics

Merge "Fix race condition in resize that was created when GetType for allocation and Types became async."

2010-11-01 16:13:55 -07:00

icu4j

Refactor Styled utility functions into reusable objects.

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

include

resolved conflicts for merge of a8d7b747 to master

2010-11-03 11:39:04 -07:00

keystore

Work on issue #3101415: Crespo apps seem to have their UID changed over time.

2010-10-15 14:46:33 -07:00

libs

Fix a key repeating bug.

2010-11-02 17:58:22 -07:00

location

am cb51c0c7: am 3e94b94f: Merge "Remove old location classes." into gingerbread

2010-09-28 18:24:48 -07:00

media

am cf393faa: Merge "resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp" into gingerbread-plus-aosp

2010-11-03 10:59:23 -07:00

native

Add plumbing for volume mute key.

2010-11-02 17:31:39 -07:00

obex

Bluetooth OBEX timeout problem.

2010-10-27 16:13:59 -07:00

opengl

Merge "OpenGL ES 1 YUV texturing test"

2010-10-28 15:44:11 -07:00

packages

Merge "Put back the back button"

2010-11-02 10:11:25 -07:00

policy

Add plumbing for volume mute key.

2010-11-02 17:31:39 -07:00

sax

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

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

services

Merge "Use AsynChannel for synchronous API"

2010-11-02 16:12:13 -07:00

telephony

Fix policy issues when screen is off.

2010-11-01 15:00:25 -07:00

test-runner

Added RepetitiveTest annotation and test runner support

2010-10-19 18:23:18 -07:00

tests

Allow both contentIntent and setOnClickPendingIntent in notifications

2010-10-31 11:38:04 -07:00

tools

More implementation of the layoutlib Paint/Canvas delegates.

2010-11-01 17:52:42 -07:00

voip

am 9a8df805: am 1112632a: Merge "docs: revise javadocs for sip add a package description, revise class descriptions and edit some method docs" into gingerbread

2010-10-29 10:26:24 -07: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

Use AsynChannel for synchronous API

2010-11-02 16:08:35 -07:00

Android.mk

Add missing NOTICE entries.

2010-10-19 16:56:02 -07:00

CleanSpec.mk

am 38476ef2: am 8f1e7b62: Merge "Cleanspec to fix incremental build failures of the form:" into gingerbread

2010-10-19 09:55:52 -07:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

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

NOTICE

Add missing NOTICE entries.

2010-10-19 16:56:02 -07:00

preloaded-classes

resolved conflicts for merge of 8b1082bb to master

2010-10-15 13:10:01 -07:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%