Jean-Baptiste Queru f9b97e6941 am fef18bfc: resolved conflicts for merge of 383aa124 to eclair-mr2 ...

Merge commit 'fef18bfcb02aa3ffb6ffb0cc13b9dace52de6bd2' into eclair-mr2-plus-aosp

* commit 'fef18bfcb02aa3ffb6ffb0cc13b9dace52de6bd2':
  fix an npe when a user tries to get an auth token from an authenticator that doesn't support it, like exchange

2009-11-15 14:46:03 -08:00

api

am 1778776c: Fix issue #2258571: Fix build versions

2009-11-12 23:06:58 -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

Merge change I3e1bdd38 into eclair-mr2

2009-11-10 11:53:19 -08:00

core

am e3cfe2d9: Fix the SDK build.

2009-11-15 10:46:51 -08:00

data

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

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

docs

am aca2c4df: am 84241293: am 3a103a87: Merge change I15536f3c into eclair-sdk

2009-11-10 09:44:08 -08:00

graphics

merge from open-source master

2009-11-15 11:04:00 -08:00

include

am 35ede78e: am 91e40e78: Merge change I18e02606 into eclair

2009-11-13 17:37:42 -08:00

keystore

Add unit test for the new keystore.

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

libs

addresses several bugs: 2206097, 2166583, 2261119, 2216759

2009-11-13 18:54:14 -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 6efdbcc3: am fddfb9ae: Merge change Iad79689a into eclair

2009-11-13 09:28:06 -08:00

obex

Update OBEX to fix missing several contact entries issue.

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

opengl

am 66b5d902: am 27407208: Merge change Icf335098 into eclair

2009-11-13 09:26:24 -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

merge from open-source master

2009-11-15 11:04:00 -08:00

telephony

am 572e0087: Merge change Idfc116fe into eclair

2009-11-12 23:06:29 -08:00

test-runner

am 227ba207: am e8228afb: Merge change I92cdc5ed into eclair

2009-10-30 18:41:08 -07:00

tests

am 592988d3: Add unit tests for Japanization and fix several bugs.

2009-11-12 19:08:23 -08:00

tools

am b2d7c60f: am ae210437: Merge change I7082e366 into eclair

2009-11-13 15:51:09 -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 external/protobuf from the build, now that it's

2009-11-13 17:14:26 -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

Change FasttrackBadgeWidget->QuickContactBadge and make public.

2009-09-30 08:33:31 -07:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%