Robert Ly d3f802c02f resolved conflicts for merge of c0b3ba83 to master ...

Change-Id: I9358b1b6f200cb41740bc4243f9ab65b3e76bd99

2011-02-02 16:08:23 -08:00

api

Reconcile api/11.xml with honeycomb-plus-aosp to fix build.

2011-02-01 17:32:46 -08:00

build

Fix the naming of the heap growth limit property.

2011-02-01 20:21:48 -08:00

cmds

am 31d3963b: am f370391f: Merge "Show the encryption boot animation." into honeycomb

2011-02-01 13:24:35 -08:00

core

Merge "Provide an empty List of dns servers, protecting against an NPE if the DHCP server omits the list of DNS servers from the DHCP-OFFER packet."

2011-02-02 13:31:48 -08:00

data

am f93d9c57: am 3d5b80cb: Merge "Low battery notification sound update, alarm sound update" into honeycomb

2011-02-02 08:16:52 -08:00

docs

resolved conflicts for merge of c0b3ba83 to master

2011-02-02 16:08:23 -08:00

drm

Bug 3361124 Remove drmioserver, continued

2011-01-21 09:06:19 -08:00

graphics

Assume ARGB_8888 for unknown configs.

2011-02-01 11:22:46 -08:00

icu4j

Refactor Styled utility functions into reusable objects.

2010-04-07 14:54:51 -07:00

include

am 09443aeb: am 62884505: Merge "Reset ANativeWindow crop on buffer geometry changes." into honeycomb

2011-01-30 15:05:42 -08:00

keystore

Update the path of the intent to unlock keystore.

2011-01-20 20:23:59 +08:00

libs

am 57188f0d: am c1f8bcff: Merge "Fix incorrect dirty rectangle transformation in hardware layers. Bug #3413433" into honeycomb

2011-02-02 00:51:13 -08:00

location

Update package descriptions with editorial revisions.

2011-01-26 14:58:19 -08:00

media

am 2fa861cc: am 261ddb81: Merge "Fix issue 3408285 Crash while generating KenBurns" into honeycomb

2011-02-02 13:22:29 -08:00

native

Merge "Add joystick support to framework."

2011-01-17 15:57:44 -08:00

obex

Removing android.security.MessageDigest

2011-02-01 22:25:47 -08:00

opengl

Merge "Clear all EGL errors when entering EGL funcs."

2011-01-31 15:40:06 -08:00

packages

am 59927ce5: am 8b805ddc: Merge "Enable retrieving default download manager settings" into honeycomb

2011-02-01 15:12:46 -08:00

policy

Mass merge from gingerbread - do not merge

2011-01-30 12:40:38 -08:00

sax

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

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

services

am e40afdf7: am 0035b5ca: Merge "Fix issue #3415137: New wallpaper size breaks thumbnails." into honeycomb

2011-02-02 13:22:40 -08:00

telephony

am 746ef9b8: am 2c507b92: Merge "Use a cached context when possible." into honeycomb

2011-02-02 13:22:33 -08:00

test-runner

Remove API that snuck into MockPackageManager

2011-01-17 13:13:37 -08:00

tests

Removing android.security.MessageDigest

2011-02-01 22:25:47 -08:00

tools

am 03245a8e: Merge "LayoutLib.Create: support Outer_Inner_Delegate renaming." into honeycomb

2011-01-31 14:32:56 -08:00

voip

Merge "Merge "SipService: registers broadcast receivers on demand."" into honeycomb

2011-01-18 02:25:52 -08:00

vpn

Make VpnService synchronous API.

2011-01-20 12:51:43 +08:00

wifi/java/android/net/wifi

Make the interface with DHCP IPv6 capable.

2011-01-26 09:10:01 -08:00

Android.mk

Merge ba3dd323 from gingerbread

2011-01-29 10:11:06 -08:00

CleanSpec.mk

Hook up large heap API.

2011-01-19 16:13:18 -08:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

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

NOTICE

resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp

2011-01-17 14:17:12 -08:00

preloaded-classes

Removing android.security.MessageDigest

2011-02-01 22:25:47 -08:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%