Jake Hamby 0cb17a52ee resolved conflicts for merge of ab79ee4a to gingerbread-plus-aosp ...

Change-Id: Ib885176060f65ef3286a24c7b9cae1a673666275

2011-06-06 15:33:37 -07:00

..

accessibilityservice

…

accounts

remove the code that clears the passwords when the sim

2011-03-07 11:11:44 -08:00

annotation

…

app

am f2006f31: Merge "Break apart queries to getInstalled* API" into gingerbread

2011-05-19 11:04:01 -07:00

appwidget

…

bluetooth

Require bonding and encryption for PBAP server

2011-05-17 07:52:15 +02:00

content

am f2006f31: Merge "Break apart queries to getInstalled* API" into gingerbread

2011-05-19 11:04:01 -07:00

database

am 69ea4e15: Documentation fixes found over vacation hacking.

2011-01-05 13:52:53 -08:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

Merge "support humidity sensor type"

2011-05-18 15:00:11 -07:00

inputmethodservice

Made paste work in ExtractEditText

2010-10-08 18:23:49 -07:00

net

Fix bad merge.

2011-04-01 14:11:30 -07:00

nfc

Implement teardown script.

2011-04-01 14:41:18 -05:00

os

Removing dead store; it was likely a relict of debuging code.

2011-04-29 13:00:54 +02:00

pim

Support quoted parameters

2011-02-18 09:40:44 -08:00

preference

Fixing memory leak in PreferenceScreen.

2011-01-18 14:34:52 +01:00

provider

resolved conflicts for merge of ab79ee4a to gingerbread-plus-aosp

2011-06-06 15:33:37 -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

Fix for crash when setting live wallpaper.

2011-01-12 15:41:55 +01:00

speech

Fixing a race condition in RecognitionService

2011-03-02 10:16:28 +00:00

test

…

text

Merge "CHAR_SEQUENCE_CREATOR cannot handle null string"

2011-04-29 10:00:20 -07:00

util

am 40bbf929: DO NOT MERGE: Backport USB accessory support to gingerbread

2011-03-02 15:16:32 -08:00

view

Merge "Adjust mBiggerTouchSlopSquare to the suitable value"

2011-04-29 10:01:23 -07:00

webkit

am 1e7fb7ae: Merge "Error in compound cache-control header."

2011-03-29 09:27:16 -07:00

widget

Merge "Scolling using arrow keys with padding"

2011-04-29 10:00:26 -07:00

package.html

…