Dianne Hackborn d0b15cecc6 resolved conflicts for merge of f3307ae8 to master ...

Change-Id: Ic59db363391f73343eba32894113914ceea5a963

2010-06-04 14:09:02 -07:00

api

resolved conflicts for merge of f3307ae8 to master

2010-06-04 14:09:02 -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

camera

Merge "Disable CameraServiceTest in a normal build." into kraken

2010-05-23 21:04:01 -07:00

cmds

am 5220af87: am 770492cb: more clean-up in preparation of bigger changes

2010-06-01 16:08:48 -07:00

common

am 0c6028c1: am c1959658: am fa2e3dcd: am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo

2010-05-12 19:12:53 -07:00

core

resolved conflicts for merge of f3307ae8 to master

2010-06-04 14:09:02 -07:00

data

Add new permission android.permission.ACCESS_USB to allow access to USB devices

2010-05-11 08:29:19 -04:00

docs

am b7371455: am c458d0e3: am b85a1679: am 85a1c578: Merge "Doc change: Adjust security sandbox description." into froyo

2010-06-03 13:04:01 -07:00

graphics

Creating the jni and java layer to integrate a3d

2010-06-04 10:06:50 -07:00

icu4j

Refactor Styled utility functions into reusable objects.

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

include

am ab5e67c6: am cefb01ab: Merge "Add KEY_SUPPORTED_METERING_MODES and fix some typos." into kraken

2010-06-04 03:41:44 -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 "Creating the jni and java layer to integrate a3d"

2010-06-04 10:10:24 -07:00

location

Merge "Add Geocorder.isImplemented()" into kraken

2010-05-24 12:59:27 -07:00

media

Merge "MTP: Add support for host cancellation of file transfers."

2010-06-04 07:20:16 -07:00

native

Update NativeActivity to allow direct surface access.

2010-05-18 18:16:35 -07:00

obex

Add ABORT support to Obex lib

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

opengl

am 36893612: am d6ddcb7f: fix [2677468] some 3rd party GL ES apps get a 32-bits surface by default and fail

2010-05-24 19:13:52 -07:00

packages

remove logging

2010-06-02 14:48:46 -07:00

policy

am ff97998a: am 4762c2d7: Add expand and collapse.

2010-06-02 22:38:20 -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 f3307ae8 to master

2010-06-04 14:09:02 -07:00

telephony

Add needsOtaServiceProvisioning to Phone.

2010-05-24 17:50:32 -07:00

test-runner

new API in Context. on openDatabase, new param DatabaseErrorHandler

2010-06-03 12:38:11 -07:00

tests

Merge "Add indexeddb files to the skip list"

2010-06-03 07:05:47 -07:00

tools

new API in Context. on openDatabase, new param DatabaseErrorHandler

2010-06-03 12:38:11 -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

am 12cd606d: am 0cbda99f: The status bar draws its icons now.

2010-06-02 22:37:04 -07:00

CleanSpec.mk

The status bar draws its icons now.

2010-06-02 14:48:41 -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

Added ListPopupWindow. Refactored AutoCompleteTextView and Spinner

2010-06-04 12:18:16 -07:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%