Jean-Baptiste Queru 8f4a04f04c am 1358b6a4: Tweak to make merges easier ...

* commit '1358b6a4fb68e81058aa938e46b125350bdf0fff':
  Tweak to make merges easier

2011-01-29 14:32:04 -08:00

api

Merge d350dc04 from gingerbread

2011-01-29 10:57:48 -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 1358b6a4: Tweak to make merges easier

2011-01-29 14:32:04 -08:00

data

Merge "Updated notification sounds for trygon" into honeycomb

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

docs

am fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread

2011-01-29 11:16:13 -08:00

drm

More fix for 64 bit offset.

2011-01-19 15:38:16 -08:00

graphics

Fix bitmap meshes to work in display lists.

2011-01-23 16:36:11 -08:00

icu4j

…

include

do not merge bug 3370834 Cherrypick from master

2011-01-26 11:20:01 -08:00

keystore

Update the path of the intent to unlock keystore.

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

libs

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

2011-01-27 11:24:33 -08:00

location

resolved conflicts for merge of ee27dd35 to master

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

media

am c929677e: Merge "Increase the number of useful bits in the spectrum." into gingerbread

2011-01-29 09:32:05 -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

Import revised translations. DO NOT MERGE

2011-01-28 13:16:00 -08:00

policy

Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread

2011-01-27 18:22:14 -08:00

sax

…

services

Merge 0ef57993 from gingerbread

2011-01-29 11:04:41 -08:00

telephony

Merge 6b739dc7 from gingerbread

2011-01-29 12:59:20 -08:00

test-runner

Remove API that snuck into MockPackageManager

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

tests

A few small cleanning-ups.

2011-01-24 12:07:37 -08:00

tools

Merge "visibility ("lights out") API." into honeycomb

2011-01-23 19:26:13 -08:00

voip

do not merge bug 3370834 Cherrypick from master

2011-01-26 11:20:01 -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

Merge ba3dd323 from gingerbread

2011-01-29 10:11:06 -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 00118a48 to honeycomb-merge

2011-01-27 18:25:32 -08:00

preloaded-classes

Update preloaded-classes for Honeycomb.

2011-01-21 17:25:55 -08:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%