Jeff Hamilton e3db3d6209 Merge commit '525f953b' into manualmerge ...

Conflicts:
	api/current.xml

Change-Id: I6cbde67b8da6b85def6e3ddd985b0e04edf279a7

2011-01-09 21:01:56 -06:00

api

Merge commit '525f953b' into manualmerge

2011-01-09 21:01:56 -06:00

build

…

cmds

…

core

Merge commit '525f953b' into manualmerge

2011-01-09 21:01:56 -06:00

data

…

docs

…

drm

…

graphics

…

icu4j

…

include

…

keystore

…

libs

…

location

…

media

…

native

…

obex

…

opengl

…

packages

…

policy

…

sax

…

services

…

telephony

…

test-runner

…

tests

…

tools

…

voip

…

vpn

…

wifi/java/android/net/wifi

…

Android.mk

…

CleanSpec.mk

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

…

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%