Jim Miller 3ecd3624d5 am 86103cd7: resolved conflicts for merge of ee3fd99a to eclair-mr2-plus-aosp ...

Merge commit '86103cd7dbcf3b5a949711d2b0b21b01ed90cb74'

* commit '86103cd7dbcf3b5a949711d2b0b21b01ed90cb74':
  resolved conflicts for merge of ee3fd99a to eclair-mr2-plus-aosp

2009-11-18 01:02:27 -08:00

api

am daf05d3e: am a57632fe: Fix bugs around removing and attaching WebViews.

2009-11-17 07:29:50 -08:00

awt

Removed system/framework/android.awt.jar.

2009-07-02 14:11:33 -05:00

build

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

camera/libcameraservice

Fix potential deadlock in stopPreview/stopRecord.

2009-11-10 17:08:08 -08:00

cmds

am 7174fcf6: am f9bf75d5: am e2071c6b: Merge change I326e3e29 into eclair

2009-11-17 07:29:03 -08:00

core

am 86103cd7: resolved conflicts for merge of ee3fd99a to eclair-mr2-plus-aosp

2009-11-18 01:02:27 -08:00

data

Update keyguard and pattern-lock layouts for new UX designs.

2009-11-12 09:37:44 -08:00

docs

resolved conflicts for merge of bc1add83 to master

2009-11-17 11:13:31 -08:00

graphics

am f56f317f: am fa0394c9: Merge change I715333b8 into eclair

2009-11-17 17:41:02 -08:00

include

am 2c766498: Merge change Iea6a38c6 into eclair-mr2

2009-11-17 10:50:22 -08:00

keystore

Add unit test for the new keystore.

2009-09-29 15:20:24 +08:00

libs

Merge change Id10824da

2009-11-17 18:53:07 -08:00

location/java

GPS: Fix problem with SUPL when SUPL APN is already active.

2009-10-08 17:24:21 -04:00

media

am edc1b064: am ae9dd9b7: am b3f35041: Merge change I86db22ef into eclair

2009-11-17 16:13:57 -08:00

obex

Update OBEX to fix missing several contact entries issue.

2009-11-10 15:34:18 -08:00

opengl

am 8d0e1472: am a822f02b: resolved conflicts for merge of dc49acb0 to eclair-mr2

2009-11-17 07:34:53 -08:00

packages

Import revised translations. DO NOT MERGE

2009-11-13 17:13:39 -08:00

sax/java/android/sax

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

services

am 9a5985a8: Merge change I24e47245 into eclair-mr2

2009-11-17 21:57:38 -08:00

telephony

am d96c94aa: am ae29ac17: am 572e0087: Merge change Idfc116fe into eclair

2009-11-13 10:51:23 -08:00

test-runner

am 6e045e0a: am e0cadd7c: Merge change Iffbb6e55 into eclair

2009-11-16 15:29:15 -08:00

tests

am 7798d36a: am d2f813c3: Merge change I60cfe9ce into eclair-mr2

2009-11-17 18:11:19 -08:00

tools

am fe11d1a7: am 43e9eb28: am 9ddb7df8: Fix build.

2009-11-17 07:37:47 -08:00

vpn/java/android/net/vpn

Remove deprecated VpnType.getDescription().

2009-09-30 18:39:48 +08:00

wifi/java/android/net/wifi

Add wifi "HANGED" driver state triggering reload.

2009-10-23 11:12:47 -07:00

Android.mk

Remove googleclient from the framework, and its classes from the preload list.

2009-11-17 21:06:45 -08:00

cleanspec.mk

Rename [I]DropBox[Service] to [I]DropBoxManager[Service].

2009-11-12 13:58:27 -08:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

NOTICE

Start using CLDR for some date-and-time strings and formats.

2009-05-15 10:15:50 -07:00

preloaded-classes

resolved conflicts for merge of 5a0db121 to master

2009-11-17 23:05:41 -08:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%