Gilles Debunne 0dfb86010c am f9bb1cd1: resolved conflicts for merge of fb729202 to master ...

* commit 'f9bb1cd1fcff7079445dae494ce5d56276092c11':
  Invalidated bounds tightened in TextView

2011-12-06 16:17:28 -08:00

api

am 1113e755: am ea25ea7e: Merge "Adding a system preference whether to speak passwords in accessibility mode." into ics-mr1

2011-12-06 10:32:51 -08:00

build

…

cmds

am ec42750e: am 0c0120ef: Merge "Fix issue #5714517: App shortcuts can result in bad task intents" into ics-mr1

2011-12-05 19:20:45 -08:00

core

resolved conflicts for merge of fb729202 to master

2011-12-06 15:57:47 -08:00

data

…

docs

am 939a3dd4: am 25bcbbb5: 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 17:57:14 -08:00

drm

…

graphics

…

icu4j

…

include

…

keystore

…

libs

am 7da48db9: Merge "Clip text correctly Bug #5706056"

2011-12-05 11:58:03 -08:00

location

…

media

resolved conflicts for merge of 07bacabe to master

2011-12-05 13:31:17 -08:00

native

…

nfc-extras

…

obex

…

opengl

gltrace: Make framebuffer contents an optional message.

2011-12-05 14:13:16 -08:00

packages

Merge "Import revised translations. DO NOT MERGE" into ics-mr1

2011-12-06 10:34:41 -08:00

policy

Merge "Making Face Unlock fix that wasn't proerly merged in master"

2011-12-06 07:25:59 -08:00

sax

…

services

Merge "Move native vold calls to varargs."

2011-12-06 10:38:55 -08:00

telephony

am 00f1ac80: am 2a7b5ab1: Merge "Be careful sharing connections when dun is in play" into ics-mr1

2011-12-02 17:57:37 -08:00

test-runner

…

tests

am 267a4b06: am c649180d: am f296ee69: Merge "Send animation start notification back to webkit from ui thread" into ics-mr1

2011-11-30 14:03:11 -08:00

tools

Merge "Upgrade layoutlib generation code to use ASM 4.0"

2011-12-06 13:31:04 -08:00

voip

…

wifi/java/android/net/wifi

Switch to notifications for walled garden

2011-12-05 14:12:06 -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

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

…

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%