Robert Greenwalt ca4306c976 resolved conflicts for merge of ec52c98d to master ...

Change-Id: I31297232c9d918a967b93c3ae977f81b6a94f2ed

2010-09-09 13:15:32 -07:00

..

accessibilityservice

…

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

Fix bug with LayoutTransition when layouts are just coming on line

2010-09-08 17:17:25 -07:00

annotation

…

app

Rename several animation classes

2010-09-08 09:41:21 -07:00

appwidget

Adding callback and fix to RemoteViewsFactory on notifyDataSetChanged.

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

bluetooth

Decouple Tethering UI with registering of SDP records.

2010-09-02 14:34:40 -07:00

content

am e7578344: am 5872e9d7: Merge "Allow incoming SMS until internal storage is almost full." into gingerbread

2010-09-08 14:38:15 -07:00

database

remove some useless code and add some code to aid in debugging

2010-09-07 22:18:31 -07:00

ddm

…

debug

…

emoji

…

gesture

…

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

resolved conflicts for merge of ec52c98d to master

2010-09-09 13:15:32 -07:00

os

am 5fdacb8a: am ee455f5a: Merge "People holding partial wake locks now get blamed for CPU usage." into gingerbread

2010-09-08 14:38:20 -07:00

pim

Fix again.

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

preference

am 9eb32c96: am a2f2141c: Merge "More SharedPreferences commit() -> apply() changes." into gingerbread

2010-09-03 13:27:51 -07:00

provider

resolved conflicts for merge of ec52c98d to master

2010-09-09 13:15:32 -07:00

security

…

server

Decouple Tethering UI with registering of SDP records.

2010-09-02 14:34:40 -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

…

text

am de5cfcb6: am d9c80ab3: Merge "Fix for a memory leak in TextKeyListener." into gingerbread

2010-09-08 15:50:50 -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

resolved conflicts for merge of a05088c1 to master

2010-09-08 13:02:55 -07:00

webkit

Add setting for on screen zoom buttons

2010-09-07 11:46:57 -07:00

webruntime

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

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

widget

AdapterViewAnimator now properly handles notifyDataSetChanged

2010-09-08 14:58:16 -07:00

package.html

…