Marco Nelissen 3e5fd52205 Resolve conflicts for commit '3ce65633' ...

Change-Id: I7ad67f68ce30a9fc4492f8291eded28d19aa65dd

2010-08-05 11:23:14 -07:00

api

resolved conflicts for merge of acc4e683 to master

2010-08-05 02:53:22 -07:00

awt

Add correct copyright headers to multiple files

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

build

…

cmds

am b72d3180: am 81046c8c: Merge "Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes." into gingerbread

2010-07-22 13:57:39 -07:00

core

am c5183aca: am c68bcc32: Merge "Only allow one movePackage operation in-flight" into gingerbread

2010-08-05 10:47:15 -07:00

data

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

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

docs

am fa32a45a: am f2d16bc5: am 5aa4680e: update device dashboard

2010-08-03 15:52:43 -07:00

graphics

Adding more matrix math functions.

2010-08-05 10:28:43 -07:00

icu4j

Refactor Styled utility functions into reusable objects.

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

include

Adding parseSizesList, getSupportedPreviewSizes to CameraParameters.

2010-08-04 14:04:07 -07:00

keystore

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

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

libs

Adding more matrix math functions.

2010-08-05 10:28:43 -07:00

location

Add new system service CountryDetector

2010-07-28 09:45:57 +08:00

media

resolved conflicts for merge of acc4e683 to master

2010-08-05 02:53:22 -07:00

native

resolved conflicts for merge of 02513855 to master

2010-07-29 22:06:44 -07:00

obex

Add ABORT support to Obex lib

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

opengl

am d12a98e2: am 9abce39a: Merge "fix [2421247] implement eglGetProcAddress(), needed in the ndk" into gingerbread

2010-08-04 11:12:25 -07:00

packages

Basic support for notification payloads in the panel.

2010-08-05 09:34:50 -04:00

policy

Let action modes overlay window content

2010-08-04 17:42:44 -07:00

sax

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

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

services

am c5183aca: am c68bcc32: Merge "Only allow one movePackage operation in-flight" into gingerbread

2010-08-05 10:47:15 -07:00

telephony

Switch to new enum definition in RilCmds

2010-08-04 15:39:24 -07:00

test-runner

fix build breakage

2010-08-04 18:05:00 -07:00

tests

Add android:hardwareAccelerated to Activity.

2010-08-04 10:55:46 -07:00

tools

Fix the layoutlib Paint.set(Paint) method. Do not merge.

2010-07-19 10:19:49 -07:00

vpn

…

wifi/java/android/net/wifi

Handle loss of supplicant events at start

2010-07-28 17:40:20 -07:00

Android.mk

add droiddoc flag for honeycomb apis (for reference filtering)

2010-08-04 10:32:25 -07:00

CleanSpec.mk

Cleanup of signed/unsigned

2010-07-29 19:10:25 -07:00

MODULE_LICENSE_APACHE2

…

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

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%