Robert Ly 65bdc59ea0 resolved conflicts for merge of 810c1c0c to honeycomb-plus-aosp ...

Conflicts:
	docs/html/guide/guide_toc.cs

Change-Id: I42d55f7ae899a914dc3f1c8a55492411c28057a2

2011-02-11 13:49:09 -08:00

api

Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb"

2011-02-03 12:20:31 -08:00

build

Fix the naming of the heap growth limit property.

2011-02-01 20:21:48 -08:00

cmds

fix [3374821] Cannot take screenshot of HC preview

2011-02-08 20:43:00 -08:00

core

am c1cc9ba6: am 58c9d472: Merge "More documentation updates for NFC." into gingerbread

2011-02-10 13:52:48 -08:00

data

Merge "Fix bug 3425610 Reduce lock / unlock sound level" into honeycomb

2011-02-04 16:06:45 -08:00

docs

resolved conflicts for merge of 810c1c0c to honeycomb-plus-aosp

2011-02-11 13:49:09 -08:00

drm

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

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

graphics

clean up and add javadocs

2011-02-09 16:24:12 -08:00

icu4j

Refactor Styled utility functions into reusable objects.

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

include

am b66b7a2c: Merge "fix [3408713] Dialog window invisible sometimes" into honeycomb

2011-02-10 15:08:33 -08:00

keystore

Update the path of the intent to unlock keystore.

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

libs

am cbcd9335: Merge "Basic 101 level compute example for RS." into honeycomb

2011-02-10 15:08:41 -08:00

location

Update package descriptions with editorial revisions.

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

media

am f7f24996: Merge "Fix issue 3426489 Overlay background changed when exported" into honeycomb

2011-02-04 19:11:55 -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

Fix a multithreading bug in libagl's EGL.

2011-01-30 15:59:36 -08:00

packages

am c7bece13: Merge "Import revised translations. DO NOT MERGE" into honeycomb

2011-02-08 10:40:47 -08:00

policy

Mass merge from gingerbread - do not merge

2011-01-30 12:40:38 -08:00

sax

…

services

am ada1b6f2: Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread

2011-02-09 13:09:12 -08:00

telephony

am bdce3d2c: am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation"

2011-02-10 13:53:10 -08:00

test-runner

docs: fix links to revised fundamentals documents

2011-02-08 11:37:44 -08:00

tests

Empty the clip rect when intersection is empty.

2011-02-04 00:59:34 -08:00

tools

am dc3fc3dc: Merge "LayoutLib: fix the background of title/action bars." into honeycomb

2011-02-08 14:57:19 -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

Merge "Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb Gallery" into honeycomb

2011-02-07 17:22:43 -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

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%