Joe Onorato 749984798c fix bad merge ...

Change-Id: I44b9265a7ef3accc5c794d2ef9308b050c961a81

2010-10-21 11:38:25 -04:00

api

Add ActionBar tab callback method onTabReselected

2010-10-19 17:18:20 -07:00

build

…

cmds

Add missing NOTICE entries.

2010-10-19 16:56:02 -07:00

core

resolved conflicts for merge of 368fdba4 to master

2010-10-21 07:39:10 -07:00

data

Add keycodes and meta-key modifiers to support external keyboards.

2010-10-15 16:00:07 -07:00

docs

am 81df9841: am 2c1dab44: am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo

2010-10-17 13:49:45 -07:00

drm

…

graphics

Some cleanup

2010-10-18 17:18:50 -07:00

icu4j

…

include

Revert "Add length-equality test in String operator== checks."

2010-10-20 17:06:28 -07:00

keystore

Work on issue #3101415: Crespo apps seem to have their UID changed over time.

2010-10-15 14:46:33 -07:00

libs

resolved conflicts for merge of 368fdba4 to master

2010-10-21 07:39:10 -07:00

location

…

media

Fix a copy & paste logging error.

2010-10-20 16:05:40 -07:00

native

Add keycodes and meta-key modifiers to support external keyboards.

2010-10-15 16:00:07 -07:00

obex

…

opengl

…

packages

resolved conflicts for merge of 368fdba4 to master

2010-10-21 07:39:10 -07:00

policy

resolved conflicts for merge of 368fdba4 to master

2010-10-21 07:39:10 -07:00

sax

…

services

fix bad merge

2010-10-21 11:38:25 -04:00

telephony

resolved conflicts for merge of 368fdba4 to master

2010-10-21 07:39:10 -07:00

test-runner

Added RepetitiveTest annotation and test runner support

2010-10-19 18:23:18 -07:00

tests

Merge "Add fast/js/regexp-overflow.html to DumpRenderTree skip list"

2010-10-19 05:27:12 -07:00

tools

am ec62719c: am 004f968d: Merge "Link against the static libcrypto in external/openssl." into gingerbread

2010-10-19 09:52:16 -07:00

voip

resolved conflicts for merge of 368fdba4 to master

2010-10-21 07:39:10 -07:00

vpn

…

wifi/java/android/net/wifi

Change removeNetowrk to a synchronous channel call.

2010-10-20 15:52:42 -07:00

Android.mk

Add missing NOTICE entries.

2010-10-19 16:56:02 -07:00

CleanSpec.mk

am 38476ef2: am 8f1e7b62: Merge "Cleanspec to fix incremental build failures of the form:" into gingerbread

2010-10-19 09:55:52 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

Add missing NOTICE entries.

2010-10-19 16:56:02 -07:00

preloaded-classes

resolved conflicts for merge of 8b1082bb to master

2010-10-15 13:10:01 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%