Jeff Hamilton 93ec68e6a9 resolved conflicts for merge of 06bb3aef to honeycomb-plus-aosp ...

Change-Id: Ia7071ca07d917bd79e7697f4b0c0640ebb5f6a6f

2011-01-14 00:38:31 -06:00

..

accessibilityservice

…

accounts

Revert "Remove the APIs for the old encryption scheme."

2011-01-13 14:15:43 -06:00

animation

Supress layout requests while a LayoutTransition is running.

2011-01-12 18:14:40 -08:00

annotation

…

app

resolved conflicts for merge of 06bb3aef to honeycomb-plus-aosp

2011-01-14 00:38:31 -06:00

appwidget

Adding widget auto-advance capability

2010-11-10 17:18:37 -08:00

bluetooth

Fix bug in handling connect/disconnect multiple devices.

2011-01-13 15:59:27 -08:00

content

am a3cdaa53: Revert "Remove the APIs for the old encryption scheme."

2011-01-13 12:18:40 -08:00

database

bug:3330569 print better message to help debug the problem

2011-01-10 15:37:47 -08:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

Enable camera preview to a SurfaceTexture.

2011-01-07 17:40:24 -08:00

inputmethodservice

Added support for full PC-style keyboards.

2010-11-18 09:49:03 -08:00

net

fix a long-standing 'typo' bug

2011-01-06 18:46:39 -08:00

nfc

resolved conflicts for merge of 06bb3aef to honeycomb-plus-aosp

2011-01-14 00:38:31 -06:00

os

Remove accidental StrictMode logging left in.

2011-01-13 16:15:40 -08:00

pim

Refrain warning when not appropriate. Do not merge

2010-10-04 07:59:34 -07:00

preference

Add a way to insert a parent bread crumb so that deep linked settings can navigate up.

2010-12-14 15:17:32 -08:00

provider

Fixing field description.

2011-01-10 15:29:54 -08:00

security

…

server

Fix bug in handling connect/disconnect multiple devices.

2011-01-13 15:59:27 -08:00

service/wallpaper

am 54f428a6: am bdb7aee0: Merge "Fix for crash when setting live wallpaper."

2011-01-13 10:26:19 -08:00

speech

Add support in TTS for volume and panning control of the synth output

2011-01-05 16:24:30 -08:00

test

Added RepetitiveTest annotation and test runner support

2010-10-19 18:23:18 -07:00

text

MaxLines is respected in TextViews, even when ellipsize is set to end.

2011-01-04 18:05:53 -08:00

util

Patch new JSON APIs with changes informed by GSON.

2011-01-10 12:56:31 -08:00

view

am 5b907be8: Merge "Move the main thread check to the appropriate place." into honeycomb

2011-01-13 18:38:25 -08:00

webkit

Merge "b/3133123 Pass touch point ids to WebKit." into honeycomb

2011-01-13 17:02:33 -08:00

widget

Merge "fix for cts DuplicateParentStateEnabled bug with TextViews." into honeycomb

2011-01-13 14:51:33 -08:00

package.html

…