Daniel Sandler 32cd1d5053 resolved conflicts for merge of 31796297 to master ...

Change-Id: Ice632b3378f8f67c186245fdb63b022ade864ba1

2011-02-07 16:12:16 -05:00

api

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

2011-02-03 18:08:44 -08:00

build

Fix the naming of the heap growth limit property.

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

cmds

Ignore format change message in sf2 instead of asserting

2011-02-04 10:14:08 -08:00

core

resolved conflicts for merge of 31796297 to master

2011-02-07 16:12:16 -05:00

data

am bf13e077: am e8d2b985: Merge "Scrubbing OGGs and updating all WAVs" into honeycomb

2011-02-07 10:47:39 -08:00

docs

am be779cb7: am 4fe3e53e: update menu dev guide with more info about action bar

2011-02-07 11:40:04 -08:00

drm

Bug 3361124 Remove drmioserver, continued

2011-01-21 09:06:19 -08:00

graphics

Fixes cache misses and extra allocations.

2011-02-03 16:20:08 -08:00

icu4j

…

include

Improvements/fixes to ACodec.

2011-02-04 10:12:26 -08:00

keystore

Update the path of the intent to unlock keystore.

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

libs

am 38e8c353: am 59301777: Merge "Fix leak in reused display lists" into honeycomb

2011-02-07 11:38:47 -08:00

location

Update package descriptions with editorial revisions.

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

media

Merge "MTP: Add support for querying all objects in GetObjectPropList"

2011-02-07 12:14:13 -08:00

native

Merge "Add joystick support to framework."

2011-01-17 15:57:44 -08:00

obex

Removing android.security.MessageDigest

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

opengl

Extend recycled bitmap check to all GLUtils APIs.

2011-02-07 11:36:47 -08:00

packages

resolved conflicts for merge of 31796297 to master

2011-02-07 16:12:16 -05:00

policy

am 2e4b9985: am 6354dd0b: Merge "Fix 3403858: Remove lock icons from status1 area." into honeycomb

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

sax

…

services

resolved conflicts for merge of 31796297 to master

2011-02-07 16:12:16 -05:00

telephony

am b6bf10e4: Merge 917d9ea1

2011-02-07 10:48:25 -08:00

test-runner

Remove API that snuck into MockPackageManager

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

tests

resolved conflicts for merge of 31796297 to master

2011-02-07 16:12:16 -05:00

tools

am 5e76e0ae: Merge "LayoutLib: Fix some rendering issues" into honeycomb

2011-02-03 11:23:39 -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

Bind addr and prefixLength together in LinkAddress

2011-01-28 15:34:55 -08:00

Android.mk

am 796f1af0: Merge "resolved conflicts for merge of 77ba255e to honeycomb-plus-aosp" into honeycomb-plus-aosp

2011-01-26 19:13:54 -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 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%