Adam Powell 243657993c resolved conflicts for merge of db81dc72 to master ...

Change-Id: Ie7e1d9a255934e45d8b241b15e9674046cff2444

2011-12-07 18:18:58 -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

System bar now renders the back button for recents

2011-12-06 17:22:19 -08:00

appwidget

Making default widget padding public API

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

bluetooth

Cleanup references when turning BT off.

2011-11-28 16:19:36 -08:00

content

am 3eebad61: am 3744d1fa: am 9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0

2011-12-07 11:33:01 -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

Adding a system preference whether to speak passwords in accessibility mode.

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

Handle the case of Preference lists that have header views inserted at the top.

2011-09-29 15:16:16 -07:00

provider

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

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

server

am 12479141: am 0d9a41e7: Merge "Broadcast turning on/off intent as early as possible when switch on/off BT" into ics-mr1

2011-12-05 20:00:46 -08:00

service

Refactor InputQueue as InputEventReceiver.

2011-12-01 21:04:47 -08:00

speech

Simplify the implementation of AudioPlaybackHandler.

2011-12-01 16:30:26 +00:00

test

…

text

Merge "Scroll performance improved in multiline TextEdit" into ics-mr1

2011-12-01 15:04:35 -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 db81dc72 to master

2011-12-07 18:18:58 -08:00

webkit

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

2011-12-07 14:38:05 -08:00

widget

am a21ce1f1: am 0a361b10: Merge "Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug 5703782)" into ics-mr1

2011-12-07 14:36:34 -08:00

package.html

…