Dianne Hackborn dc71b9e4d6 resolved conflicts for merge of 6a3eddb4 to master ...

Change-Id: I1ca1d100274d4a733ef2bf58b0d5d7217b4f858e

2010-09-30 20:34:34 -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

bug fixes in animation classes

2010-09-26 13:05:09 -07:00

annotation

…

app

resolved conflicts for merge of 6a3eddb4 to master

2010-09-30 20:34:34 -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 738aadd7 to master

2010-09-30 19:33:43 -07:00

content

resolved conflicts for merge of 6a3eddb4 to master

2010-09-30 20:34:34 -07:00

database

SQLiteDatabase: fix inconsistent locking

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

ddm

…

debug

…

emoji

…

gesture

…

hardware

am 6bbc2f15: am 2fb818ca: Fix the javadoc of Parameters.setRotation.

2010-09-30 13:38:15 -07:00

inputmethodservice

Add methods for managing subtypes

2010-09-23 16:25:07 +09:00

net

resolved conflicts for merge of 6a3eddb4 to master

2010-09-30 20:34:34 -07:00

os

am 6ce5f60c: am 38cf8867: Remove OBBs from state list when volume unmounted

2010-09-30 19:46:46 -07:00

pim

Merge "Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)" into gingerbread

2010-09-27 02:16:01 -07:00

preference

Make the headers pane disappear in no-headers mode, not just the ListView.

2010-09-26 13:29:01 -07:00

provider

resolved conflicts for merge of 538c3fa3 to master

2010-09-30 14:41:59 -07:00

security

…

server

resolved conflicts for merge of 738aadd7 to master

2010-09-30 19:33:43 -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 9785bf0f: am 14a288da: Merge "Add suuport for splitting touch events across windows." into gingerbread

2010-09-27 14:40:38 -07:00

util

am f78fdacc: am eaa2cabf: Merge "Fix problem where Base64InputStream single-byte reads were unsigned." into gingerbread

2010-09-22 13:53:33 -07:00

view

Drag/drop APIs and infrastructure

2010-09-30 16:29:07 -07:00

webkit

am cb6f29eb: am a16682b5: Merge "Allow touch events when clickable *or* longClickable" into gingerbread

2010-09-28 13:20:05 -07:00

widget

resolved conflicts for merge of 6e9a021e to master

2010-09-30 13:09:43 -07:00

package.html

…