Dianne Hackborn ade9916d5c resolved conflicts for merge of 6421ae7e to master ...

Change-Id: Ic8c4418f13a42fc1d3a44ad68e32b4e438b07f6f

2010-09-13 21:41:57 -07:00

..

accessibilityservice

Fix for bug 2448479

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

accounts

am 6f50a956: am 799f2bb0: am b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo

2010-08-06 19:07:24 -07:00

animation

Make fragment animations work when fragments go away

2010-09-10 17:43:04 -07:00

annotation

…

app

Some fragment stuff:

2010-09-12 17:10:04 -07:00

appwidget

Adding callback and fix to RemoteViewsFactory on notifyDataSetChanged.

2010-08-17 14:25:06 -07:00

bluetooth

resolved conflicts for merge of 0522f5e9 to master

2010-09-13 14:57:59 -07:00

content

resolved conflicts for merge of 6421ae7e to master

2010-09-13 21:41:57 -07:00

database

caching code retooled to reduce locking + handle SMP

2010-09-13 14:38:24 -07:00

ddm

…

debug

…

emoji

…

gesture

Prevent possible NPE in android.gesture.Learner

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

hardware

Quell annoying Java ascii/unicode warning.

2010-09-06 19:22:09 -07:00

inputmethodservice

Made text selection work in ExtractEditText. DO NOT MERGE

2010-09-07 18:07:30 -07:00

net

am f353daa0: am 90fb15a7: Support UI visibility and restarting in download manager.

2010-09-12 19:14:42 -07:00

os

resolved conflicts for merge of 53686433 to master

2010-09-13 16:56:10 -07:00

pim

Fix again.

2010-09-02 13:48:09 -07:00

preference

Some fragment stuff:

2010-09-12 17:10:04 -07:00

provider

Accessibility support for WebViews

2010-09-13 10:21:34 -07:00

security

…

server

Add missing return statement.

2010-09-13 15:24:01 -07:00

service

Force wallpaper surface to 565.

2010-09-08 16:32:27 -07:00

speech

Updated documentation for upcoming fix for @code tags

2010-08-26 14:02:20 -07:00

test

New test on ContextMenuInfo packed positions.

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

text

resolved conflicts for merge of 171c83f4 to master

2010-09-12 13:55:18 -07:00

util

am 75f0024c: am 6e86915e: Merge "Fixes to battery stats debug output." into gingerbread

2010-09-07 15:16:38 -07:00

view

Merge "Fix bug 2995805 - splitMotionEvents behavior change"

2010-09-13 18:18:47 -07:00

webkit

am fbd26467: Merge "DO NOT MERGE" into gingerbread

2010-09-13 11:51:55 -07:00

webruntime

Fix NPE in the webruntime after the splash screen has been dismissed.

2010-07-08 12:26:50 +01:00

widget

Fix text rendering issue with text scaling.

2010-09-12 17:59:13 -07:00

package.html

…