Wink Saville 1b9a6a6e58 resolved conflict for merge of fc51aaec to master ...

Change-Id: Iee4d9ecc946dd1bbf114a70ad32db0fe47a027df

2011-06-04 07:31:35 -07:00

..

accessibilityservice

Accessibility serviceconfiguration via meta-data

2011-05-31 12:04:18 -07:00

accounts

…

animation

…

annotation

…

app

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

2011-06-03 18:02:10 -07:00

appwidget

…

bluetooth

Bluetooth: correcting return value from cancelDiscovery

2011-06-02 10:30:49 -07:00

content

resolved conflicts for merge of cc20b4e3 to master

2011-06-03 15:01:49 -07:00

database

Remove the obsolete function that is not used anymore

2011-06-01 20:40:50 -07:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

…

inputmethodservice

Handle action modes in the IME extract mode view.

2011-06-02 13:29:37 -07:00

net

Collect historical network stats.

2011-06-01 17:44:52 -07:00

nfc

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

2011-05-31 16:00:46 -07:00

os

resolved conflict for merge of fc51aaec to master

2011-06-04 07:31:35 -07:00

pim

…

preference

Manual merge. Preference activity changes to work on smaller tablet screens and phones.

2011-05-26 15:20:14 -07:00

provider

resolved conflicts for merge of ca2b552d to master

2011-06-03 15:50:27 -07:00

security

…

server

…

service/wallpaper

…

speech

Language loading / availablity should repsect defaults enforcement.

2011-06-02 17:28:57 +01:00

test

…

text

Merge "Fix for bug 4499752 - Detect nulled layouts in HandleViews"

2011-05-31 10:41:58 -07:00

util

resolved conflicts for merge of 54cb63e2 to master

2011-06-02 16:44:52 -07:00

view

resolved conflicts for merge of ca2b552d to master

2011-06-03 15:50:27 -07:00

webkit

Prevent WebKit updates in loadViewState case

2011-06-03 15:36:25 -07:00

widget

resolved conflicts for merge of 955e8d79 to master

2011-06-03 17:24:05 -07:00

package.html

…