Gilles Debunne 63bd55c7bf am cdfe8999: Fix for multiple merge problem. ...

* commit 'cdfe899991c365d9e197d83f8859089cae082011':
  Fix for multiple merge problem.

2011-02-08 17:31:33 -08:00

api

am cbf0983e: Merge "Final final final Gingerbread MR API changes." into gingerbread

2011-02-01 10:10:42 -08:00

build

auto import from //depot/cupcake/@135843

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

cmds

merge 83fdc69e from gingerbread - do not merge

2011-01-14 18:33:51 -08:00

core

am cdfe8999: Fix for multiple merge problem.

2011-02-08 17:31:33 -08:00

data

Move keymaps from sdk/emulator/keymaps.

2011-01-25 19:08:04 -08:00

docs

am 779f7410: Merge "cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard" into gingerbread

2011-02-03 15:56:02 -08:00

drm

Merge "Initial OMA DRM forward lock contribution"

2011-01-13 10:51:13 -08:00

graphics

am 7d234fab: Merge "Don\'t drop the drawable cache completely on configuration change"

2011-01-14 16:11:40 -08:00

include

am a6fb375c: am 056340ac: Merge "stubs"

2011-01-31 12:03:59 -08: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

am e88fa50b: Merge from open-source gingerbread

2011-01-30 16:19:59 -08:00

location

resolved conflicts for merge of 78742e01 to stage-korg-master

2010-12-07 12:51:49 -08:00

media

am b6c2e2b4: DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.

2011-01-28 10:42:10 -08:00

native

Flush Binder commands in ndk looper.

2011-01-10 14:37:46 -08:00

obex

Bluetooth OBEX timeout problem.

2010-10-27 08:38:30 +02:00

opengl

am a6fb375c: am 056340ac: Merge "stubs"

2011-01-31 12:03:59 -08:00

packages

Managed dialogs should run on the same thread as their activity.

2011-02-03 17:50:02 -08:00

policy

Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread

2011-01-27 18:22:14 -08:00

sax

Re-arrange android-common so framework no longer links with it.

2010-02-25 11:39:33 -08:00

services

am 9204644d: Merge "Fix a race condition in NativeDaemonConnector"

2011-02-07 10:04:54 -08:00

telephony

Merge from gingerbread

2011-02-03 14:25:38 -08:00

test-runner

am 524133cc: Remove API that snuck into MockPackageManager

2011-01-17 13:05:24 -08:00

tests

Delete browerplugin tests - do not merge

2011-01-29 07:41:39 -08:00

tools

am a30063d8: am 25eb0464: Merge "Normalize output from aapt d"

2011-01-29 23:04:50 -08:00

voip

do not merge bug 3370834 Cherrypick from master

2011-01-26 11:20:01 -08:00

vpn

Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources.

2010-01-29 13:35:51 -08:00

wifi/java/android/net/wifi

am bd3dd73b: Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread

2010-12-04 23:45:18 -08:00

Android.mk

enable preview mode for docs and add api level 10 flag for api level diffs

2011-01-26 18:29:50 -08:00

CleanSpec.mk

Rough first pass at the NFC technology API.

2010-11-19 20:26:29 -06:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

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

NOTICE

Fix omission in NOTICE file.

2011-01-18 15:25:32 -08:00

preloaded-classes

This class no longer exists.

2010-11-04 16:17:52 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%