Scott Main 0aa8f3b8db resolved conflicts for merge of 20d06540 to master ...

Change-Id: I80da9a11b4538c070b0000cfa3ea6cd865e46aef

2012-01-31 08:55:23 -08:00

..

accessibilityservice

AccessibilityService description not internationalized.

2012-01-03 17:05:38 -08:00

accounts

Use Map.Entry, not HashMap.Entry

2012-01-20 14:43:38 -08:00

animation

Fix bug in LayoutTransition for INVISIBLE views

2012-01-30 07:53:59 -08:00

annotation

…

app

Always initialize AsyncTask on the main thread.

2012-01-30 14:11:44 -08:00

appwidget

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

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

bluetooth

am 201469f5: am bb7f590a: Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1

2011-12-22 15:59:34 -08:00

content

Merge "Implement a cancelation mechanism for queries."

2012-01-27 17:37:24 -08:00

database

Merge "Implement a cancelation mechanism for queries."

2012-01-27 17:37:24 -08:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

am 4bc873e6: am 7944704e: Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1

2012-01-06 15:51:44 -08:00

inputmethodservice

Fixes around extract mode

2012-01-13 16:23:35 -08:00

net

Merge "Add API's for normalizing MIME's and URI's."

2012-01-25 12:55:58 -08:00

nfc

Fix doc bug.

2012-01-27 11:03:05 -08:00

os

Always initialize AsyncTask on the main thread.

2012-01-30 14:11:44 -08:00

pim

…

preference

…

provider

Merge "Handle adding/removing/renaming nomedia paths"

2012-01-30 08:27:57 -08:00

server

am 1890fa82: am 79d84930: Merge "Set Bluetooth adapter to PowerOff mode when turnoff with airplane on" into ics-mr1

2012-01-12 11:29:39 -08:00

service

resolved conflicts for merge of a80bab37 to master

2011-12-13 16:31:43 -08:00

speech

Write unit tests for android.speech.tts.

2012-01-09 13:38:55 +00:00

test

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

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

text

Merge "Throw NPE if s is null"

2012-01-26 17:05:58 -08:00

util

Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.

2012-01-25 15:14:50 -08:00

view

Merge "Add debug markers to OpenGLRenderer"

2012-01-30 17:43:37 -08:00

webkit

Merge "Remove code that quits the webcore watchdog thread."

2012-01-31 02:17:12 -08:00

widget

resolved conflicts for merge of 20d06540 to master

2012-01-31 08:55:23 -08:00

package.html

…