Jake Hamby 7d259626d0 resolved conflicts for merge of 0cb17a52 to honeycomb-plus-aosp ...

Change-Id: I784e6d1946fa708f63becece070c7090cec6f1e2

2011-06-07 15:01:50 -07:00

..

accessibilityservice

…

accounts

…

animation

…

annotation

…

app

am b4815f47: am bd754205: Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2

2011-06-03 17:57:33 -07:00

appwidget

…

bluetooth

am 58ada2f3: am 94062517: Merge "Require bonding and encryption for PBAP server"

2011-06-06 11:34:11 -07:00

content

am a5f88510: am 2969b511: Merge "Add new supports-screen API to set maximum allowed size." into honeycomb-mr2

2011-06-01 22:34:31 -07:00

database

…

ddm

…

debug

…

emoji

…

gesture

…

hardware

am ae448e2c: am a88b42d5: USB: Add method to access raw USB device descriptors

2011-05-19 10:06:44 -07:00

inputmethodservice

…

net

resolved conflicts for merge of 8de47a2f to honeycomb-LTE

2011-06-07 12:45:41 -07:00

nfc

am 5e654d02: am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2

2011-05-25 16:32:12 -07:00

os

am 6ff5ba00: Merge "Add FileUtils.checksumCrc32" into honeycomb-LTE

2011-06-04 06:24:40 -07:00

pim

…

preference

More preference item visual adjustments for smaller tablets. DO NOT MERGE

2011-05-24 15:50:36 -07:00

provider

resolved conflicts for merge of 0cb17a52 to honeycomb-plus-aosp

2011-06-07 15:01:50 -07:00

security

…

server

am 1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread

2011-05-27 13:46:50 -07:00

service/wallpaper

…

speech

…

test

…

text

am 19653c64: am 425db473: Merge "CHAR_SEQUENCE_CREATOR cannot handle null string"

2011-04-29 17:15:39 -07:00

util

Add "tv" density for 720p screens.

2011-05-27 13:40:26 -07:00

view

am b3536145: am ed48fa89: Merge "Touch pad improvements. Bug: 4124987" into honeycomb-mr2

2011-06-06 20:34:38 -07:00

webkit

am 277bfd7c: am c1830a77: Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2

2011-06-06 20:32:02 -07:00

widget

am 00afa11c: am 0538e621: Merge "Tap timeout removed on paste. Relying on position only." into honeycomb-mr2

2011-06-03 10:35:58 -07:00

package.html

…