Adam Powell 2e6b4ad76c resolved conflicts for merge of f61c3d07 to master ...

Change-Id: Id38b4ff3ccc677b2d9e743186473b3559b00119b

2011-05-18 10:33:20 -07:00

api

Merge "View horizontalDirection public attribute resolution to an internal var."

2011-05-17 14:16:43 -07:00

build

Fix the naming of the heap growth limit property.

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

cmds

dumpstate: don't attempt to use vril-dump, it breaks adb bugreport

2011-05-17 21:35:54 -07:00

core

resolved conflicts for merge of f61c3d07 to master

2011-05-18 10:33:20 -07:00

data

am ee081bf5: am 3ed0a1ec: Merge "IMS: Provide net_admin permission so that IPSec could be configured/used." into honeycomb-LTE

2011-05-03 16:36:36 -07:00

docs

am 2c898da6: am 32638ccb: am 4ef5f4dc: am 566489db: Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d

2011-05-18 10:25:02 -07:00

drm

Fix memory leak from retrieval of getSupportedDrmInfo.

2011-04-24 12:40:16 -07:00

graphics

Core to client fifo on sockets.

2011-05-17 15:01:29 -07:00

icu4j

Refactor Styled utility functions into reusable objects.

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

include

Merge "Add auto-white balance locking to the Camera API."

2011-05-18 08:54:40 -07:00

keystore

Move to KeyChain.bind

2011-05-17 16:20:36 -07:00

libs

Merge "Add auto-white balance locking to the Camera API."

2011-05-18 08:54:40 -07:00

location

Use passive provider for location based country detection

2011-04-28 16:18:19 -07:00

media

Merge "Properly forward rotation information from input format to output format."

2011-05-18 09:40:52 -07:00

native

Add initial API for stylus and mouse buttons.

2011-05-13 12:11:17 -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

fix (Again) adding OES postfix when looking for gl functions

2011-05-11 20:37:47 -07:00

packages

Import revised translations.

2011-05-17 16:51:41 -07:00

policy

am 21f1d49f: am a7f52d46: Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2

2011-05-17 09:55:53 -07:00

sax

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

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

services

am 53b988ba: am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2

2011-05-18 09:23:35 -07:00

telephony

am 360f5533: am 7b0339a8: Merge "No data icon switch seen between LTE to EHRPD Handover" into honeycomb-LTE

2011-05-16 16:35:10 -07:00

test-runner

Rework display size access.

2011-04-21 15:17:52 -07:00

tests

Merge "change how test sets timeout for webkit dump"

2011-05-16 11:28:17 -07:00

tools

am d0054160: am 6d040a7f: am 738c5e60: am 2fae858d: LayoutLib: implement data binding for most AdapterView

2011-05-13 16:43:37 -07:00

voip

update for new audio.h header location

2011-05-12 14:09:57 -07:00

vpn

Make VpnService synchronous API.

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

wifi/java/android/net/wifi

DO NOT MERGE Add DhcpStateMachine

2011-05-12 14:10:11 -07:00

Android.mk

First pass at NetworkPolicy and activity tracking.

2011-05-13 16:20:21 -07:00

CleanSpec.mk

The decoder wrapper is no longer needed. Also disable building old-style decoders.

2011-05-12 11:24:13 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

resolved conflicts for merge of 00118a48 to honeycomb-merge

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

preloaded-classes

Removing android.security.MessageDigest

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

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%