Robert Greenwalt d1c3ea6a21 resolved conflicts for merge of 3cd6a3e3 to master ...

Change-Id: If3e45cc3494b2c52a1f1dcc19deff763a50498d7

2010-05-26 10:37:48 -07:00

api

Fix 2673731: Adding support for password history to Device Admin.

2010-05-24 17:13:18 -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

Make the -o option actually terminate.

2010-05-20 16:32:29 -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 3cd6a3e3 to master

2010-05-26 10:37:48 -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

Doc change: Fix incorrect adt version reference etc.

2010-05-24 09:07:14 -07:00

graphics

Begin naming cleanup for renderscript runtime.

2010-05-19 17:23:08 -07:00

icu4j

Refactor Styled utility functions into reusable objects.

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

include

Merge "Fix issue 2667796: [Audio Effect Framework] Effect factory and libraries." into kraken

2010-05-24 23:23:29 -07:00

keystore

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

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

libs

Fix issue 2641884: Bluetooth volume is dependent on in call volume.

2010-05-25 09:31:59 -07:00

location

Merge "Add Geocorder.isImplemented()" into kraken

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

media

am 779b9b82: am f7617d36: Merge "Support for thumbnail extraction in the Matroska extractor." into kraken

2010-05-25 14:20:46 -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

am 89ad07b0: am 42ee86e6: Merge "For issue #2651381, allow library prelinking." into froyo

2010-05-06 12:43:52 -07:00

policy

resolved conflicts for merge of 8b625a95 to master

2010-05-18 18:21:07 -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 3cd6a3e3 to master

2010-05-26 10:37:48 -07:00

telephony

Add needsOtaServiceProvisioning to Phone.

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

test-runner

Remove the unused modification APIs from MockCursor. They shouldn't have been public in the first place.

2010-05-13 23:44:10 -05:00

tests

Merge WebKit at r59636: Added appcache/fallback.html to the ignore list.

2010-05-25 15:51:22 +01:00

tools

am cee6300c: am 38a410f1: am 686d9ff5: merge from open-source master

2010-05-10 12:56:46 -07:00

vcard

Small fix around intermideate charset (ISO-8859-1).

2010-05-21 17:11:09 -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 c4a9383d: am 626db910: Store the list of source directories for the SDK.

2010-05-17 18:32:51 -07:00

CleanSpec.mk

Finish moving the policies out of frameworks/policies/base and into frameworks/base.

2010-04-06 20:21:30 -05: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

am e34d31e6: am e616553e: Updaing preloaded classes with removal of OpenSSLSocketImpl

2010-05-07 10:25:41 -07:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%