Nick Kralevich 963b0cdbaf resolved conflicts for merge of cbf26fd3 to master ...

Change-Id: I1feb7266c1d5cdebbfb8b8fa0d87d986953a20b6

2010-05-14 15:49:42 -07:00

api

More fragment stuff:

2010-05-14 11:22:48 -07:00

awt

Add correct copyright headers to multiple files

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

build

…

camera

Forgot to fix one -Wformat-security in my previous change. Fixed.

2010-05-14 10:29:13 -07: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 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

am 33c06f91: am 6c034325: am 6d8e4fd8: am b83a283a: docs: add dev guide for backup

2010-05-14 11:59:04 -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

docs: fix broken link, reduce API info about backup and point to dev guide

2010-05-14 14:17:04 -07:00

graphics

Rename ProgramFragmentStore to ProgramStore.

2010-05-13 18:35:01 -07:00

icu4j

Refactor Styled utility functions into reusable objects.

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

include

Detect and handle premature termination of a recording session

2010-05-14 11:48:00 -07:00

keystore

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

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

libs

resolved conflicts for merge of cbf26fd3 to master

2010-05-14 15:49:42 -07:00

location

am b6f0cbdc: merge from open-source master

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

media

am ce3d8b31: am d95266c6: Merge "Detect and handle premature termination of a recording session" into kraken

2010-05-14 12:22:18 -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

ActionBar added to framework, integrated with Activity and styles.

2010-05-13 01:27:59 -07:00

sax

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

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

services

am 8e8bb02f: am 3f5ed04f: am b63ea5f7: am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo

2010-05-13 16:09:30 -07:00

telephony

am 658b7a5a: am 12b6f6ea: am 55b7d124: merge from open-source master

2010-05-14 13:58:26 -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 changes I8da1b801,Id88446d6,I82798d5a

2010-05-14 08:17: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

Moving junit out of core.jar and into core-junit.jar.

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

…

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%