The Android Open Source Project f815dc4e4a am 64a907c5: Reconcile with ics-mr1-release ...

* commit '64a907c5fddb9846737a8e60e603ccbe2267a930':

2012-02-21 15:38:35 -08:00

api

DO NOT MERGE

2012-02-13 15:21:04 -08:00

build

New dalvik heap config for xhdpi devices.

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

cmds

Skia API changes as a result of an update to the Skia library.

2012-01-31 14:08:22 -05:00

core

am a91b052e: am fc24982a: Merge "Call onTimeChanged when AM/PM changed."

2012-02-21 12:30:46 -08:00

data

Update to latest version of Roboto

2012-01-13 11:44:23 -08:00

docs

Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; such as removing the "unknown sources" step, because that doesn't apply to adb installs." into ics-mr1

2012-02-15 17:31:54 -08:00

drm

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)

2012-01-19 14:45:03 -08:00

graphics

am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"

2012-01-19 17:26:12 -08:00

icu4j

…

include

DO NOT MERGE

2012-02-13 15:21:04 -08:00

keystore

Make the KeyChain handled its own grants rather than having

2011-07-13 22:45:07 -07:00

libs

am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"

2012-01-19 17:26:16 -08:00

location

docs: Add developer guide cross-references, Project ACRE, round 4

2011-12-22 15:08:23 -08:00

media

am 52bfc243: docs: fix misc doc bugs from external issue tracker

2012-02-09 12:48:08 -08:00

native

DO NOT MERGE

2012-02-13 15:21:04 -08:00

nfc-extras

Move nfc-extras tests into frameworks/base/nfc-extras/tests.

2011-11-14 15:28:47 -08:00

obex

am 0c2d82c6: am 848a1e3d: Merge "OBEX: Fix PrivateOutputStream small write problem"

2011-05-20 10:51:25 -07:00

opengl

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)

2012-01-19 14:45:03 -08:00

packages

am 252c64f9: am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1

2012-02-14 12:42:40 -08:00

policy

Fix issue #6037252: Screen shifts after all apps are upgraded

2012-02-21 13:54:21 -08:00

sax

…

services

am 2aae2d96: am 01011c3d: Fix issue #6037252: Screen shifts after all apps are upgraded

2012-02-21 14:59:38 -08:00

telephony

Merge "Stop using shared DUN APN when tethering stops." into ics-mr1

2012-02-14 13:38:15 -08:00

test-runner

docs: Add developer guide cross-references, Project ACRE, round 4

2011-12-22 15:08:23 -08:00

tests

Fix a typo in image processing test

2012-02-01 10:47:18 -08:00

tools

DO NOT MERGE

2012-02-13 15:21:04 -08:00

voip

am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"

2012-01-19 17:26:12 -08:00

wifi/java/android/net/wifi

Wi-Fi: Handle disconnect in middle of DHCP operation

2012-01-27 14:51:23 -06:00

Android.mk

am 3d672e1e: Android U Class: Monetization / Ads without Compromising User Experience

2011-12-15 11:08:51 -08:00

CleanSpec.mk

Resolved conflicts for merge of 83cf0313 to master

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

MODULE_LICENSE_APACHE2

…

NOTICE

Fix omission in NOTICE file.

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

preloaded-classes

Update perf tests to always run each test in a fresh process.

2011-11-07 14:45:49 -08:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%