Jake Hamby ee60f3fb1b resolved conflicts for merge of 18cc814c to honeycomb-plus-aosp ...

Change-Id: I2b569ada3baec2dc486296623063bc2b504c5e96

2011-05-10 15:52:15 -07:00

api

Merged "Adjust mBiggerTouchSlopSquare to the suitable value"

2011-04-29 17:49:06 -07:00

build

Fix the naming of the heap growth limit property.

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

cmds

am 0c6cbf41: Merge "Better compat mode part one: start scaling windows." into honeycomb-mr2

2011-05-09 17:08:40 -07:00

core

resolved conflicts for merge of 18cc814c to honeycomb-plus-aosp

2011-05-10 15:52:15 -07:00

data

DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"

2011-05-04 10:41:20 -04:00

docs

Merge "Doc change: add Android 3.1 highlights and version notes." into honeycomb-mr1

2011-05-09 22:58:37 -07:00

drm

Fix for bug 4126624.

2011-03-24 13:14:02 -07:00

graphics

am 718516f3: am 9fd8e057: Merge "Fix memory leak of SkMovie class"

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

icu4j

Refactor Styled utility functions into reusable objects.

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

include

am 4907d1d5: am 0c6cbf41: Merge "Better compat mode part one: start scaling windows." into honeycomb-mr2

2011-05-09 17:10:34 -07:00

keystore

Update the path of the intent to unlock keystore.

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

libs

am 4907d1d5: am 0c6cbf41: Merge "Better compat mode part one: start scaling windows." into honeycomb-mr2

2011-05-09 17:10:34 -07:00

location

Fix the javadoc for LocationManager.requestSingleUpdate()

2011-03-29 11:26:08 -07:00

media

Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2

2011-05-08 22:11:52 -07:00

native

SurfaceTexture: disallow unsupported uses.

2011-03-15 10:37:37 -07:00

nfc-extras

Implement dead service recovery in NFC extras library.

2011-04-26 16:38:00 -07:00

obex

am 24a16e6c: am c34c88b9: am ec1a8f7a: Merge "Unable to push files to Windows 7"

2011-04-19 16:01:36 -07:00

opengl

Merge from gingerbread

2011-03-29 13:54:43 -07:00

packages

am 37c077d3: am 81faa44c: Merge "Move / copy some framework and systemui resources from xlarge to large. The status bar now comes up on large tablets." into honeycomb-mr2

2011-05-10 12:03:55 -07:00

policy

am 4907d1d5: am 0c6cbf41: Merge "Better compat mode part one: start scaling windows." into honeycomb-mr2

2011-05-09 17:10:34 -07:00

sax

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

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

services

resolved conflicts for merge of 18cc814c to honeycomb-plus-aosp

2011-05-10 15:52:15 -07:00

telephony

resolved conflicts for merge of 18cc814c to honeycomb-plus-aosp

2011-05-10 15:52:15 -07:00

test-runner

am 79b66725: am 25be2c72: am e0537f18: Merge "Fix of tearDown() in SingleLaunchActivityTestCase."

2011-02-28 11:05:55 -08:00

tests

am 4907d1d5: am 0c6cbf41: Merge "Better compat mode part one: start scaling windows." into honeycomb-mr2

2011-05-09 17:10:34 -07:00

tools

am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996

2011-04-27 13:48:45 -07:00

voip

am a7a9c4cb: am 46524f83: Merge "docs: add package description for RTP" into honeycomb-mr1

2011-05-05 18:02:47 -07:00

vpn

Make VpnService synchronous API.

2011-01-20 12:51:43 +08:00

wifi/java/android/net/wifi

Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE

2011-05-02 13:26:52 -07:00

Android.mk

am 1c71fffe: update platform version number for docs

2011-05-05 15:18:19 -07:00

CleanSpec.mk

resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp

2011-03-14 10:28:11 -07: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

Removing android.security.MessageDigest

2011-02-01 22:25:47 -08:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%