Jean-Baptiste Queru 0460e26a4c resolved conflicts for merge of 691be97f to gingerbread-plus-aosp ...

Change-Id: Ic095e7f9203eb1465ddf3c195ebf1200e9393124

2010-08-20 17:16:37 -07:00

api

resolved conflicts for merge of 691be97f to gingerbread-plus-aosp

2010-08-20 17:16:37 -07:00

awt

…

build

…

cmds

…

core

resolved conflicts for merge of 691be97f to gingerbread-plus-aosp

2010-08-20 17:16:37 -07:00

data

…

docs

…

graphics

am d6f7f225: Merge "Load bitmaps in the correct format." into gingerbread

2010-08-20 15:45:09 -07:00

include

…

keystore

…

libs

…

location

…

media

…

native

…

obex

…

opengl

…

packages

…

policy

…

sax

…

services

…

telephony

am b2cc86da: am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN.

2010-08-20 16:37:21 -07:00

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

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%