Dianne Hackborn b5052de757 resolved conflicts for merge of a80bab37 to master ...

Change-Id: Id71cc68a617e1ea0dd2f3932d454be6dba336eef

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

..

accessibilityservice

resolved conflicts for merge of 26f7a81f to master

2011-11-30 18:34:56 -08:00

accounts

When in the Choose Account flow if the accounts list display was initially

2011-11-15 17:33:08 -08:00

animation

Use a Choreographer to schedule animation and drawing.

2011-12-05 16:39:59 -08:00

annotation

…

app

am 2ad8a89b: am a1279586: Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1

2011-12-12 18:01:22 -08:00

appwidget

Making default widget padding public API

2011-11-07 17:59:23 -08:00

bluetooth

Add BluetoothAdapter.getRemoteDevice(byte[])

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

content

am 2ad8a89b: am a1279586: Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1

2011-12-12 18:01:22 -08:00

database

Fix JavaDoc typos.

2011-11-08 20:24:21 -08:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

Merge "Add a method to get empty camera parameters."

2011-11-30 00:47:01 -08:00

inputmethodservice

IOOB is Suggestions

2011-12-06 15:46:58 -08:00

net

am 4741163c: am fbb09ea8: Merge "Fix NPE in trimV4AddrZeros." into ics-mr1

2011-12-07 17:12:47 -08:00

nfc

Merge "Throw a nicer error message when using an invalid context to create Nfc"

2011-11-21 17:31:45 -08:00

os

am bea42859: am aa2719df: am 3937e055: Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0

2011-12-07 17:17:09 -08:00

pim

…

preference

…

provider

Make the URL for the JavaScript based screen-reader used by WebView configurable.

2011-12-07 14:35:59 -08:00

server

am 18ad6514: am ed0830c5: Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1

2011-12-12 15:39:27 -08:00

service

resolved conflicts for merge of a80bab37 to master

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

speech

Remove BlockingMediaPlayer.

2011-12-06 16:19:05 +00:00

test

…

text

am 0d3a5e4c: am 67d54ac0: Merge "NPE in GMail / TextLine" into ics-mr1

2011-12-13 13:42:07 -08:00

util

resolved conflicts for merge of 26f7a81f to master

2011-11-30 18:34:56 -08:00

view

resolved conflicts for merge of a80bab37 to master

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

webkit

Merge "Move ssl callbacks to webcore thread."

2011-12-13 10:25:18 -08:00

widget

am 2450b36a: am 19636dc4: Merge "Do not spell check the foreground ExtractEditText." into ics-mr1

2011-12-13 15:59:26 -08:00

package.html

…