The Android Open Source Project 8aa0e4e3fd am d7f36121: am 50d0511d: Reconcile with ics-factoryrom-2-release ...

* commit 'd7f36121f64fbbfaf640f073e01c43441b149d97':
  Revert "Improve the slow query instrumentation."
  Revert "Merge "Improve the slow query instrumentation." into ics-mr0"

2011-10-31 19:47:50 +00:00

api

Merge "Add a flag for recommended suggestions of the spell checker" into ics-mr1

2011-10-28 18:26:40 -07:00

build

New dalvik heap config for xhdpi devices.

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

cmds

Add service/aah_timesrv

2011-10-28 10:14:48 -04:00

core

am 1759af3b: Merge "Bug 5535639 - Monkeys mad at FragmentManager" into ics-mr1

2011-10-31 19:39:10 +00:00

data

merged by hand (services/java/com/android/server/PowerManagerService.java needs to be reviewed)

2011-10-31 06:06:27 -07:00

docs

am b44038fd: docs: platform note typo

2011-10-28 16:39:46 +00:00

drm

Modified loadPlugIns to load from /vendor and /system; skip libraries that are already loaded.

2011-09-21 21:50:31 -07:00

graphics

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

2011-10-29 02:16:10 +00:00

icu4j

Refactor Styled utility functions into reusable objects.

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

include

merged by hand (services/java/com/android/server/PowerManagerService.java needs to be reviewed)

2011-10-31 06:06:27 -07:00

keystore

Make the KeyChain handled its own grants rather than having

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

libs

am 66ce1fce: Merge "Removing changes not meant for MR1" into ics-mr1

2011-10-31 17:31:48 +00:00

location

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

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

media

merged by hand (services/java/com/android/server/PowerManagerService.java needs to be reviewed)

2011-10-31 06:06:27 -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 09848bc8: Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0

2011-10-29 02:16:10 +00:00

packages

am 650ee281: Merge "Using fast-invalidate pattern for screenshot animations." into ics-mr1

2011-10-31 17:57:02 +00:00

policy

merged by hand (services/java/com/android/server/PowerManagerService.java needs to be reviewed)

2011-10-31 06:06:27 -07:00

sax

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

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

services

Fix merge problem

2011-10-31 10:30:29 -04:00

telephony

am 31d157ba: Merge "Fix bug in enabling/disabling SMS cell broadcast activation." into ics-mr0

2011-10-28 02:14:08 +00:00

test-runner

Fix ownership of CursorWindows across processes.

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

tests

am 66ce1fce: Merge "Removing changes not meant for MR1" into ics-mr1

2011-10-31 17:31:48 +00:00

tools

Revert "Treat parcelables as flattenables for now, until the sdk contains a newer aidl."

2011-10-28 10:14:52 -04:00

voip

SipService: handle connectivity changes correctly.

2011-09-30 16:46:30 -07:00

wifi/java/android/net/wifi

Merge "docs: add package description for wifi.p2p and update the one for wifi" into ics-mr0

2011-10-27 08:49:48 -07:00

Android.mk

merged by hand (services/java/com/android/server/PowerManagerService.java needs to be reviewed)

2011-10-31 06:06:27 -07:00

CleanSpec.mk

Resolved conflicts for merge of 83cf0313 to master

2011-10-10 16:46:35 -07:00

MODULE_LICENSE_APACHE2

…

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%