Gilles Debunne 816dd3d443 resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp ...

Change-Id: I7f9c71eeb9fc5e01856f764930c6f168741cc9da

2011-03-14 12:57:01 -07:00

..

accessibilityservice

Fix for bug 2448479

2010-02-17 16:46:42 -08:00

accounts

DO NOT MERGE

2011-03-01 11:20:06 -08:00

annotation

…

app

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

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

appwidget

merge from open-source master

2010-07-12 15:26:21 -07:00

bluetooth

am 1c9761e3: Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread

2011-01-21 21:36:32 -08:00

content

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

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

database

am 69ea4e15: Documentation fixes found over vacation hacking.

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

ddm

Added dumpHprofDataDdms() call.

2010-01-29 13:29:51 -08:00

debug

…

emoji

…

gesture

Prevent possible NPE in android.gesture.Learner

2010-02-17 10:04:39 -08:00

hardware

fix [3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]

2011-03-07 17:58:56 -08:00

inputmethodservice

Made paste work in ExtractEditText

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

net

am 4bdab175: DO NOT MERGE WiMAX support

2011-03-09 22:54:44 -08:00

nfc

Implement new NFC-EE API's as shared library (frameworks/base).

2011-03-10 16:03:46 -08:00

os

am edc68a00: Merge "Attempt to reduce problems from issue #3183612" into gingerbread

2011-03-02 18:10:33 -08: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

am 4bdab175: DO NOT MERGE WiMAX support

2011-03-09 22:54:44 -08:00

security

…

server

Phone crash when old callback func is woken up when enabling BT.

2011-01-13 08:34:13 +01:00

service

Fix for crash when setting live wallpaper.

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

speech

Bug 3365937 notify TTS initialization listener of binding errors

2011-01-20 17:25:48 -08:00

test

New test on ContextMenuInfo packed positions.

2010-02-25 13:46:50 -08:00

text

Ensuring thread-safe usage of DateFormat.

2011-02-22 09:17:51 +01:00

util

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

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

view

am ded2b006: Merge "frameworks/base: remove redundant code in WindowManager"

2011-01-18 13:20:06 -08:00

webkit

am dbf09fee: am eb17d6f5: Merge "Don\'t crash zygote if webcore fails to load"

2011-02-01 13:12:04 -08:00

widget

resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp

2011-03-14 12:57:01 -07:00

package.html

…