Eric Laurent fd5651c360 resolved conflicts for merge of 9ffe8338 to honeycomb-plus-aosp ...

Change-Id: I0fe9b61a2003566f7d66189a9d83ad5dd879fd7a

2011-01-21 15:46:05 -08:00

api

am debb5bbe: Merge "Add public API for on screen zoom controls" into honeycomb

2011-01-21 14:49:30 -08:00

build

Hook up large heap API.

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

cmds

Publish MediaMetadataRetriever.java as public API

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

core

am 4d3ac03a: am e4dd154c: Merge "hange the default IsoDep timeout to 300ms (docs update)." into gingerbread

2011-01-21 15:03:19 -08:00

data

Merge "Updated notification sounds for trygon" into honeycomb

2011-01-12 15:06:19 -08:00

docs

am 0f805632: cherrypick Change-Id: Ic268b65b127b356155dd62d737029ce442c12f51 docs: add OEM USB Drivers document and update install guide with windows 7 procedures misc style edits

2011-01-20 21:42:23 -08:00

drm

am a4b0cdc9: Merge "More fix for 64 bit offset." into honeycomb

2011-01-19 15:59:13 -08:00

graphics

Merge "fix bug 3375251 Copying arrays of objects would generate an exception due to excessive internal type checking." into honeycomb

2011-01-21 14:28:55 -08:00

icu4j

…

include

am 63d64a14: Merge "Properly rotate video that\'s marked as such and decoded to a surface." into honeycomb

2011-01-21 14:44:21 -08:00

keystore

Update the path of the intent to unlock keystore.

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

libs

am 4707dc73: am 72abf01a: Merge "Fix the ISurfaceComposer onTransact switch." into gingerbread

2011-01-21 10:15:34 -08:00

location

resolved conflicts for merge of ee27dd35 to master

2010-12-07 13:17:37 -08:00

media

am 8dac54c5: Merge "Perform orthogonal rotations without using a Skia canvas." into honeycomb

2011-01-21 15:12:14 -08:00

native

Add API to get path to OBBs.

2011-01-16 18:43:04 -08:00

obex

Bluetooth OBEX timeout problem.

2010-10-27 16:13:59 -07:00

opengl

Unhide GLSurfaceView.get/setPreserveEGLContextOnPause

2011-01-18 15:53:25 -08:00

packages

Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME." into honeycomb

2011-01-21 14:47:32 -08:00

policy

am e25c4d10: Merge "Fix 3339257: Update lockscreen keyboard to fit Holo theme" into honeycomb

2011-01-19 20:18:40 -08:00

sax

…

services

Merge "Optimize call to drawBitmap during screen rotation." into honeycomb

2011-01-21 15:29:46 -08:00

telephony

Add two more parameters too RIL_REQUEST_SETUP_DATA_CALL, DO NOT MERGE

2011-01-19 22:38:24 -08:00

test-runner

Remove API that snuck into MockPackageManager

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

tests

Merge "b/3369602 Using Math.round() to convert float coordinates to integers." into honeycomb

2011-01-21 13:03:49 -08:00

tools

LayoutLib: properly configure ApplicationInfo with targetSdkVersion.

2011-01-17 22:58:41 -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

Merge "Handle EAP authentication failure" into honeycomb

2011-01-19 17:58:19 -08:00

Android.mk

Doc change: adding missing samples

2011-01-19 19:57:37 -08:00

CleanSpec.mk

Hook up large heap API.

2011-01-19 16:13:18 -08: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

am 73cd0c39: am 7dbeb24a: This class no longer exists.

2010-11-05 13:12:48 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%