Jeff Brown 1a33274d28 resolved conflicts for merge of 167449e5 to master ...

Change-Id: Ib448e69a726eb45b5c9099d2574e40b8345eee67

2010-07-08 19:01:13 -07:00

api

Integrate Loader support in to Activity/Fragment.

2010-07-08 15:17:22 -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

am 7df74471: Merge "Flush binder buffer after setting raw heap to avoid leaking a reference." into froyo

2010-07-02 07:48:03 -07:00

cmds

am d51c2cac: am 45bac57a: Support for writing the extracted data to an .mp4 file in the stagefright commandline tool.

2010-07-01 11:56:16 -07:00

core

resolved conflicts for merge of 167449e5 to master

2010-07-08 19:01:13 -07:00

data

am cbbc035b: am de1057c4: Unhide new API for supporting multiple cameras.

2010-06-27 20:54:36 -07:00

docs

am 3b09d64a: am ef52b568: Merge "More improvements to the SensorManager documentation" into gingerbread

2010-07-07 13:33:41 -07:00

graphics

Merge "Add boolean support for setVar."

2010-07-07 18:52:03 -07:00

icu4j

Refactor Styled utility functions into reusable objects.

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

include

resolved conflicts for merge of 167449e5 to master

2010-07-08 19:01:13 -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 167449e5 to master

2010-07-08 19:01:13 -07:00

location

andriod.location.Criteria: Simplify new location criteria APIs a bit.

2010-06-23 14:34:03 -04:00

media

MTP: Use media provider database to implement MTP device support.

2010-07-08 16:21:09 -04:00

native

am e24901d3: am 68267415: Add new native Looper API.

2010-07-07 09:14:57 -07:00

obex

Add ABORT support to Obex lib

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

opengl

am 5219a82f: am 8ecfb60a: Merge "Fix a bug that prevented the creation of EGL shared contexts." into gingerbread

2010-07-02 13:39:38 -07:00

packages

top and bottom can't be the same thing

2010-07-07 18:35:58 -04:00

policy

resolved conflicts for merge of 167449e5 to master

2010-07-08 19:01:13 -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 167449e5 to master

2010-07-08 19:01:13 -07:00

telephony

Add colored rectangles implementation in OpenGLRenderer.

2010-06-24 19:30:36 -07:00

test-runner

Javadoc for test case classes

2010-06-29 15:03:58 -07:00

tests

am 0e1d3391: am b59b9445: Fix icon size in intruder alerts.

2010-07-07 11:12:27 -07:00

tools

Fixes a few minor problems with AAPT

2010-06-25 11:02:15 +01: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

am 53dca61f: am 9005e7f4: Merge "Add setWifiApConfiguration interface" into gingerbread

2010-06-25 19:53:34 -07:00

Android.mk

frameworks/base updates to track merge from dalvik-dev

2010-06-30 00:54:29 -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

frameworks/base updates to track merge from dalvik-dev

2010-06-30 00:54:29 -07:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%