Andreas Huber f314276df5 resolved conflicts for merge of 6e80c50f to ics-aah ...

Conflicts:
	media/libmediaplayerservice/MediaPlayerService.cpp

Change-Id: Icb9371dcace4609fffd048b7fdc27ee59d589a92

2011-10-13 12:59:54 -07:00

api

am f42d34bd: Merge "Add AccessibilityRecord#getMaxScrollX and #getMaxScrollY to the pubic API"

2011-10-12 12:38:12 -07:00

build

New dalvik heap config for xhdpi devices.

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

cmds

resolved conflicts for merge of 6e80c50f to ics-aah

2011-10-13 12:59:54 -07:00

core

am 64f93d4f: Merge "Don\'t redraw when not scrolling, even if finger is held down."

2011-10-13 10:19:17 -07:00

data

am 384bf04a: Merge "Remove non-module names from PRODUCT_PACKAGES"

2011-10-11 10:04:38 -07:00

docs

Merge "Fixing typo on fragments page."

2011-10-13 10:52:18 -07: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

Don't call saveLayer() when it's not required

2011-10-10 15:23:32 -07:00

icu4j

…

include

am 0eb6ef17: Merge "Support for an MPEG2 Program Stream extractor."

2011-10-13 10:05:33 -07:00

keystore

Make the KeyChain handled its own grants rather than having

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

libs

am 731934d1: Merge "Fix bug with 1D arrays and threading. Some elements got launched multiple times."

2011-10-12 21:11:44 -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 6e80c50f to ics-aah

2011-10-13 12:59:54 -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

don't log EGL errors due to unimplemented proprietary extensions

2011-10-05 19:15:32 -07:00

packages

am fd8f6f2f: Merge "Fix obsolete Honeycomb platlogo." into ics-mr0

2011-10-12 13:12:37 -07:00

policy

am a324c9d0: am 63c8a47b: Merge "Fixes 5446301" into ics-mr0

2011-10-12 21:11:50 -07:00

sax

…

services

am 2c4d954e: am f4b40de6: Merge "Fix issue #5445966: WindowManager reporting -long on prime when it shouldn\'t be." into ics-mr0

2011-10-12 21:11:36 -07:00

telephony

Merge "Set roaming indicator to off if Perferred Roaming List is not loaded." into ics-mr0

2011-10-12 18:13:20 -07:00

test-runner

Fix ownership of CursorWindows across processes.

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

tests

am a49b8ade: Merge "Start adding simple performance tests for RS compute."

2011-10-13 11:44:53 -07:00

tools

am 184b44e7: Merge "Fix ownership of CursorWindows across processes. Bug: 5332296"

2011-10-10 14:07:36 -07:00

voip

SipService: handle connectivity changes correctly.

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

wifi/java/android/net/wifi

Add a time threshold for re-enabling networks

2011-10-05 12:49:13 -07:00

Android.mk

am 74450d37: Merge "Docs changes for WiFiDirect sample"

2011-10-06 17:59:21 -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

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%