Mike Lockwood f9f42d8049 am d9a49b00: Fix broken merges from MR2: ...

Merge commit 'd9a49b00ce8702820a20ce00b4904f70718dc63b'

* commit 'd9a49b00ce8702820a20ce00b4904f70718dc63b':
  Fix broken merges from MR2:

2009-11-19 03:37:11 -08:00

api

am 08a22a20: am a2f4c254: am 1d62ea9d: Fix issue #2249821: Unable to start passion in safe mode

2009-11-18 12:03:41 -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 d28fcd5b: resolved conflicts for merge of efd91d7c to eclair-mr2-plus-aosp

2009-11-18 17:55:09 -08:00

common

Solve the mutual interdependency problem between common and framework:

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

core

Merge change I9444b196

2009-11-19 00:41:01 -08:00

data

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

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

docs

am cfd1458a: am 9d6704f9: am d2a9f54f: am afcd516e: Merge change Iaae72f66 into eclair-sdk

2009-11-18 18:01:41 -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 15b0bd2e: am 4eaf35b9: am a0e37e9d: Merge change I941136fd into eclair

2009-11-18 17:55:44 -08:00

obex

Update OBEX to fix missing several contact entries issue.

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

opengl

Extend GLSurfaceView to make it easy to create an OpenGL ES 2.0 context

2009-11-19 19:08:52 +08:00

packages

am 0fb041f3: am 3266c5f1: resolved conflicts for merge of f476c480 to eclair-mr2

2009-11-05 14:12:16 -08:00

sax/java/android/sax

auto import from //depot/cupcake/@135843

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

services

Fix broken merges from MR2:

2009-11-19 01:44:58 -05:00

telephony

resolved conflicts for merge of a351b7f0 to master

2009-11-18 13:43:10 -08:00

test-runner

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

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

tests

am e922751e: am 6a942dbe: Merge change Ifd754059 into eclair-mr2

2009-11-18 18:30:40 -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

Solve the mutual interdependency problem between common and framework:

2009-11-18 15:08:18 -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 a351b7f0 to master

2009-11-18 13:43:10 -08:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%