Nick Pelly a64e2ad4da resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp ...

Change-Id: Iff9ea08b810b0d142a9227272492c0305a9bcf42

2011-03-14 10:28:11 -07:00

..

accessibilityservice

…

accounts

Fix a deadlock in AccountManagerService cause by different

2011-03-01 11:23:19 -08:00

animation

Cancel LayoutTransition animations selectively

2011-03-02 18:37:31 -08:00

annotation

…

app

Fix issues #4087362 and #4087356

2011-03-11 13:48:32 -08:00

appwidget

Small change to AppWidgetProviderInfo public field name and docs

2011-02-28 14:53:09 -08:00

bluetooth

Refactor android.server.BluetoothService classes.

2011-02-24 16:26:20 -08:00

content

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

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

database

cosmetic fixes: removing unused members/imports

2011-03-01 18:37:52 -08:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

USB: minor cleanup work

2011-03-11 18:51:29 -05:00

inputmethodservice

Follow up change to I741642ac

2011-01-30 11:02:09 +09: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

Clarify rules about encryption of emulated storage.

2011-03-07 19:13:42 -08:00

pim

am 1aba843d: am ccc802e1: Merge "Support quoted parameters" into gingerbread

2011-02-22 21:23:50 -08:00

preference

Fix issues #4087362 and #4087356

2011-03-11 13:48:32 -08:00

provider

am 4bdab175: DO NOT MERGE WiMAX support

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

security

Removing android.security.MessageDigest

2011-02-01 22:25:47 -08:00

server

Merge "Start using NetworkUtils.numericToInetAddress."

2011-03-02 12:10:51 -08:00

service/wallpaper

Add support for mouse hover and scroll wheel.

2011-02-25 17:06:07 -08:00

speech

Fix bug 3511256 invalid TTS parameter cache size

2011-03-03 18:55:19 -08:00

test

…

text

getTextRunCursor gets deprecated in SpannableStringBuilder

2011-03-04 11:19:40 -08:00

util

Remove deprecated and unused entryEvicted method.

2011-03-07 09:07:07 -08:00

view

Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]

2011-03-10 17:20:21 -08:00

webkit

Merge "Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances" into honeycomb-mr1

2011-03-11 16:39:42 -08:00

widget

Fix external bug http://code.google.com/p/android/issues/detail?id=15183

2011-03-09 16:35:13 -08:00

package.html

Update package descriptions with editorial revisions.

2011-01-26 14:58:19 -08:00