Justin Ho d5b9b26081 Resolve conflicts for merge 121e805a to master ...

Conflicts:
	CleanSpec.mk

Change-Id: I750218dbd78e15c1ae3324b3bcfbcd28a4da2676

2011-10-03 17:06:26 -07:00

api

Format NaN and Infinity as Doclava expects.

2011-09-28 17:04:52 -04:00

build

New dalvik heap config for xhdpi devices.

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

cmds

Support AMR, G.711 and vorbis audio in ACodec and friends.

2011-09-28 12:37:36 -07:00

core

Merge "Don't obtain attributes for the whole theme when looking for selection mode drawables."

2011-10-03 16:57:05 -07:00

data

Resolve conflicts for merge 121e805a to master

2011-10-03 17:06:26 -07:00

docs

Merge "docs: remove gerunds from UI dev guides and resolve linkbacks"

2011-10-03 16:06:47 -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

Remove unused fields in ProgramRaster

2011-09-23 14:18:53 -07:00

icu4j

…

include

SurfaceTexture: parameterize the texture target

2011-09-30 14:19:41 -07:00

keystore

Make the KeyChain handled its own grants rather than having

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

libs

SurfaceTexture: parameterize the texture target

2011-09-30 14:19:41 -07:00

location

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

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

media

Merge "Remove Ringtone.setWakeMode, it's not needed."

2011-09-30 11:13:39 -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

Avoid allocating temporary memory for Matrix operations.

2011-09-20 19:59:26 -07:00

packages

Merge "Fix contentDescriptions in status bar."

2011-10-03 11:08:52 -07:00

policy

Merge "allow override of HDMI rotation"

2011-10-03 15:32:14 -07:00

sax

…

services

Merge "Remember wifi disable due to airplane"

2011-10-03 13:53:42 -07:00

telephony

Do not format numbers starting with hash or star.

2011-09-27 13:53:23 +01:00

test-runner

Allow non-required package verifiers

2011-09-23 16:03:03 -07:00

tests

Merge "Revert "log stack trace when finish() or onDestroy() is called""

2011-09-29 10:14:27 -07:00

tools

Cherry-pick f1dee1 from master for SDK. do not merge.

2011-10-03 09:54:57 -07:00

voip

SipService: handle connectivity changes correctly.

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

wifi/java/android/net/wifi

Fix IPv6 on wifi

2011-09-29 16:59:01 -07:00

Android.mk

update version codes for doc filtering and footer version name

2011-09-21 18:09:25 -07:00

CleanSpec.mk

Resolve conflicts for merge 121e805a to master

2011-10-03 17:06:26 -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%