Jean-Michel Trivi b8efdf7f80 am 1155efdc: (-s ours) am 2ba92c71: do not merge bug 3370834 Cherrypick from master ...

* commit '1155efdc715413cd7a881e5226b5f5f0b2db8f71':
  do not merge bug 3370834 Cherrypick from master

2011-01-26 14:12:45 -08:00

api

am 2c070bae: Merge "Re-enabling queued unbinding of services after requests to the service. (3394210)" into honeycomb

2011-01-26 12:32:50 -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

Remove unused API

2011-01-26 13:43:01 -08:00

data

Merge "Fix emulator touchscreen." into honeycomb

2011-01-26 10:46:29 -08:00

docs

am 31e5c30f: Merge "docs: revise and amend platform notes for preview" into honeycomb

2011-01-25 14:48:19 -08:00

drm

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

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

graphics

Remove unused API

2011-01-26 13:43:01 -08:00

icu4j

Refactor Styled utility functions into reusable objects.

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

include

am a9f27fa6: Merge "Protect notification callback parameters with a mutex." into honeycomb

2011-01-26 11:44:17 -08:00

keystore

Update the path of the intent to unlock keystore.

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

libs

am 8fc7690f: Merge "Hook up tgammaf properly for RS." into honeycomb

2011-01-26 14:10:58 -08:00

location

resolved conflicts for merge of ee27dd35 to master

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

media

am 45e3d123: Merge "Overlay java files Issue 3370836" into honeycomb

2011-01-26 12:48:32 -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

egl: clear error on function entry

2011-01-25 15:36:21 -08:00

packages

Merge "Integrating drawable-xlarge stat_sys assets" into honeycomb

2011-01-26 13:02:01 -08:00

policy

am 1aadb210: Merge changes I48392c75,Id09437a4,I4a0aa878 into honeycomb

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

sax

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

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

services

am a0f40033: Merge "fix [3385504] Surface flinger hang when adding dim surface" into honeycomb

2011-01-26 12:43:16 -08:00

telephony

am d8b525c3: Merge "Increase the default timeout from 30 to 60 seconds." into honeycomb

2011-01-26 10:16:43 -08:00

test-runner

Remove API that snuck into MockPackageManager

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

tests

Merge "Fit and finish on status bar:" into honeycomb

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

tools

LayoutLib: return ViewInfo for all merged items + Build init.

2011-01-25 15:55:16 -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

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

NOTICE

resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp

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

preloaded-classes

Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle

2011-01-24 18:17:21 -08:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%