Chet Haase 2a639347ae resolved conflicts for merge of aa4d2f69 to master ...

Change-Id: Iadb63ecf52d8bd2911276fa3db55a43c9c378620

2011-11-05 12:01:51 -07:00

api

am cb1001b2: Merge "Fix a memory leak of a Binder in SpellCheckerService" into ics-mr1

2011-11-03 09:13:13 +00:00

build

New dalvik heap config for xhdpi devices.

2011-09-15 17:52:04 -07:00

cmds

am 55fe6763: Merge "Include showmap output in bug report." into ics-mr1

2011-11-05 16:40:10 +00:00

core

resolved conflicts for merge of aa4d2f69 to master

2011-11-05 12:01:51 -07:00

data

am f136aa34: Merge "Various performance and other work." into ics-mr1

2011-11-02 17:30:26 +00:00

docs

am 6d77ad80: am 6c5951bf: Doc change: Updating device-admin with camera info.

2011-11-04 11:34:16 +00:00

drm

Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE

2011-10-26 09:57:54 +01:00

graphics

am e0ad4746: Merge "Some optimizations for view inflation." into ics-mr1

2011-11-03 22:19:36 +00:00

icu4j

Refactor Styled utility functions into reusable objects.

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

include

am 236aea35: Merge changes Ibc99cb1c,Ie1f4f6f8 into ics-mr1

2011-11-03 18:55:14 +00:00

keystore

Make the KeyChain handled its own grants rather than having

2011-07-13 22:45:07 -07:00

libs

Merge "Slight change to the unwinder API."

2011-11-04 20:06:42 -07:00

location

Acknowledge that the platform guarantees UTF-8 and UTF-16.

2011-07-19 12:10:07 -07:00

media

resolved conflicts for merge of 914972be to master

2011-11-05 09:32:35 -07:00

native

fix the float Rect in OpenGLRenderer to handle NANs

2011-09-19 16:50:07 -07:00

nfc-extras

Preserve invariant that sService is not null (although NfcAdapter.get() can return null)

2011-07-09 23:57:22 -07:00

obex

am 0c2d82c6: am 848a1e3d: Merge "OBEX: Fix PrivateOutputStream small write problem"

2011-05-20 10:51:25 -07:00

opengl

am 74b2b954: am 09848bc8: Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0

2011-10-31 12:26:31 +00:00

packages

Import revised translations. DO NOT MERGE

2011-11-02 15:14:43 -07:00

policy

am 1f42a3db: Merge "Bring back Android Dreams." into ics-mr1

2011-11-03 10:59:54 +00:00

sax

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

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

services

am 3f9ce4c2: Merge "Verify AppWidget ownership during update." into ics-mr1

2011-11-03 18:49:05 +00:00

telephony

am e4ca9242: Fix the build.

2011-11-04 11:59:29 +00:00

test-runner

Fix ownership of CursorWindows across processes.

2011-10-09 22:10:36 -07:00

tests

More performance work:

2011-11-02 22:08:41 -07:00

tools

Set theme-tag in render log when failing to find style

2011-11-01 11:51:20 -07:00

voip

Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE

2011-10-26 09:57:54 +01:00

wifi/java/android/net/wifi

am a3d9eba1: Merge "Reset IP failure counter on a success" into ics-mr1

2011-11-03 23:10:04 +00:00

Android.mk

Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0

2011-10-31 13:28:57 -07:00

CleanSpec.mk

Resolved conflicts for merge of 83cf0313 to master

2011-10-10 16:46:35 -07: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

Fix preloaded classes for the emulator.

2011-08-25 23:51:56 -04:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%