Gilles Debunne 152c7c4091 resolved conflicts for merge of 115b9dc3 to master ...

Change-Id: I37ee3a50fcafbaa7de510b3af8e133a89bd9e339

2010-10-04 14:02:50 -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

am e468a4bc: am 751b4731: Merge "A few additions to the download manager public API documentation" into gingerbread

2010-10-01 14:19:09 -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

am 9e1556de: am 14e7d693: Merge "Some documentation fixes." into gingerbread

2010-10-01 17:11:41 -07:00

database

resolved conflicts for merge of 6718b365 to master

2010-10-01 13:57:04 -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

Add SystemService.restart.

2010-10-03 13:53:26 -07:00

pim

Refrain warning when not appropriate. Do not merge

2010-10-04 07:59:34 -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 277465fb: am 57bd0615: Merge "b/3054044 Make allDay event times format in utc" into gingerbread

2010-10-01 11:21:21 -07:00

view

am 57fa3e8b: am 9e32a438: Merge "Support haptic feedback for virtual keys defined in key layout." into gingerbread

2010-10-01 17:08:34 -07:00

webkit

Ensure full screen plugin is dismissed when necessary.

2010-10-01 11:19:36 -04:00

widget

resolved conflicts for merge of 115b9dc3 to master

2010-10-04 14:02:50 -07:00

package.html

…