Gilles Debunne 2afcfa4239 resolved conflicts for merge of 5371a165 to master ...

Change-Id: I61830ec96c277ebba9db3e40842597b9c98d53c7

2011-12-09 18:06:34 -08:00

api

Merge "Add BluetoothAdapter.getRemoteDevice(byte[])"

2011-12-09 14:37:05 -08:00

build

New dalvik heap config for xhdpi devices.

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

cmds

Add tap and swipe capabilities to the "input" tool.

2011-12-06 16:06:13 -08:00

core

resolved conflicts for merge of 5371a165 to master

2011-12-09 18:06:34 -08:00

data

Update Armenian and Georgian fonts

2011-12-07 15:53:21 -08:00

docs

Merge "Cherry: Reduce file size for ADL presentation shareable."

2011-12-07 15:54:16 -08:00

drm

Fix log message

2011-11-10 14:58:44 -08:00

graphics

am a962ef29: am 4c593010: Merge "Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body." into ics-mr1

2011-11-17 04:08:30 -08:00

icu4j

Refactor Styled utility functions into reusable objects.

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

include

Merge "GenerationCache::get would return a random value instead of NULL Bug #5401917"

2011-12-08 18:51:03 -08:00

keystore

Make the KeyChain handled its own grants rather than having

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

libs

Merge "Improve the VSYNC api a bit."

2011-12-07 14:15:21 -08:00

location

Acknowledge that the platform guarantees UTF-8 and UTF-16.

2011-07-19 12:10:07 -07:00

media

am a5038d16: am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1

2011-12-09 14:25:49 -08:00

native

am c339fe30: am be6ab576: Merge "Fix application launch shortcuts." into ics-mr1

2011-11-29 13:17:42 -08:00

nfc-extras

Fix BasicNfcEeTest java package.

2011-12-09 14:35:32 -08:00

obex

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

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

opengl

Fix convert8To4, convert8To5

2011-12-09 14:06:07 -08:00

packages

am b490d8d6: am 29933fb2: Merge "Improve handling of small largeIcons in tablet ticker." into ics-mr1

2011-12-07 17:43:39 -08:00

policy

Merge "Checking whether screen is on in constructor fixes 5658742"

2011-12-09 16:28:39 -08:00

sax

…

services

am 944c985b: am e0e9fd98: Merge "Fix system hotkey handling." into ics-mr1

2011-12-09 14:25:38 -08:00

telephony

am ea75b822: am 234a5ef6: Merge "When the SIM_READY set current preferred network type." into ics-mr1

2011-12-07 20:19:50 -08:00

test-runner

Fix ownership of CursorWindows across processes.

2011-10-09 22:10:36 -07:00

tests

Merge "Making UI a bit more responsive."

2011-12-09 10:04:27 -08:00

tools

Add aapt support for implicitly-granted permissions

2011-12-08 08:46:34 -08:00

voip

am 0e67685e: am bfd85f9a: Merge "SIP: turn off verbose logs." into ics-mr1

2011-11-21 21:07:56 -08:00

wifi/java/android/net/wifi

Remove explicit network disabling code

2011-12-09 15:06:20 -08:00

Android.mk

am 431c3e4c: Merge "Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html" into ics-mr0

2011-12-02 12:46: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

resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp

2011-01-17 14:17:12 -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%