Adam Powell e4b8ff8068 resolved conflicts for merge of 6a828712 to master ...

Change-Id: I73c804667a890bcc9924951ff655137c1345541a

2011-12-06 16:53:47 -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 2fc9467e: am 88f10c6c: Merge "Fix issue #5679504: Device stuck and sudden reboot - Watchdog reset?" into ics-mr1

2011-11-30 14:18:59 -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 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

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

Move native netd calls to varargs.

2011-12-02 13:08:26 -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

Merge "Make sure onPostExecute() is never called after cancel() Bug #5651553"

2011-12-05 14:50:54 -08:00

pim

…

preference

…

provider

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

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 6a828712 to master

2011-12-06 16:53:47 -08:00

webkit

Merge "Remove inFullScreenMode JNI call during drawGL call."

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

widget

resolved conflicts for merge of fb729202 to master

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

package.html

…