The Android Open Source Project 8bf05f4742 resolved conflicts for merge of fe953c43 to master ...

Change-Id: Iedf5b55f97f938242e25bcf5098982b2d3e43c68

2010-05-12 15:22:06 -07:00

api

am 6d7334c1: am afbc5fad: Fix build Remove from API 9 definition the two methods that were removed from API 8.

2010-05-12 10:55:59 -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

Force sooner/generic/sim to use camera stub only.

2010-05-10 15:04:40 +08:00

cmds

am c65ede9b: am bd535646: am 57fff78a: dumpstate: Add blocked process wait-channel info to bugreport

2010-04-27 12:27:56 -07:00

common

am b20842c7: am 8579a4d7: am 625de488: am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo

2010-05-12 09:24:20 -07:00

core

Merge "Skip ActivityWaiter synchronization on Instrumentation.callActivityOnDestroy"

2010-05-12 14:26:10 -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

Merge "Doc change: remove Google I/O 09 from carousel." into froyo

2010-05-12 11:05:03 -07:00

graphics

Convert renderscript from using ACC to LLVM for its compiler.

2010-05-11 14:03:58 -07:00

icu4j

Refactor Styled utility functions into reusable objects.

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

include

am b003ad17: am e0dc80f8: Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo

2010-05-12 07:55:48 -07:00

keystore

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

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

libs

am 9813a3a2: am b3390135: am d8c33747: am 78624e41: Add remove method in CameraParameters class.

2010-05-12 09:14:11 -07:00

location

am b6f0cbdc: merge from open-source master

2010-05-10 13:50:32 -07:00

media

am 6914e17a: am 08eff49f: am d9712b69: am b1235a57: Merge "Hide two audio focus methods." into froyo

2010-05-12 09:25:25 -07:00

native

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

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

obex

Add ABORT support to Obex lib

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

opengl

am 1b7e3ef4: am 55bef14f: am fb234bbe: merge from open-source master

2010-05-12 12:16:45 -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

Fixing bug 2660263, changed text for PIN unlock

2010-05-10 18:02:31 -07:00

sax

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

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

services

am 9a069c80: am 63ece47f: am 2a9ae01f: merge from open-source master

2010-05-12 12:47:45 -07:00

telephony

resolved conflicts for merge of fe953c43 to master

2010-05-12 15:22:06 -07:00

test-runner

Merge "Add test runner log when test case class is not loaded."

2010-04-26 10:30:56 -07:00

tests

am 342e520b: am 4924ea49: am c8e84e12: am b4c9a8f6: Merge "Fix imf tests." into froyo

2010-05-12 09:25:51 -07:00

tools

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

2010-05-10 12:56:46 -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 b796d698: am dd142ac3: am 052e2102: am 0d1b0814: Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files.

2010-05-12 09:26:07 -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%