Kenny Root 9ca6d71c52 resolved conflicts for merge of c6bf3eaa to master ...

Change-Id: I6421faf52c160a81b03c63b91f1aedfe0f151cac

2010-10-15 11:20:42 -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

Merge "Remove errant minus sign"

2010-10-14 15:07:30 -07:00

annotation

…

app

resolved conflicts for merge of c6bf3eaa to master

2010-10-15 11:20:42 -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 bbb90d13 to master

2010-10-15 10:02:57 -07:00

content

am 94980e0f: am 07e1be62: Merge "Fix NPE caused by Change I4df27119." into gingerbread

2010-10-15 00:07:40 -07:00

database

when printing requery on UI warning, include additional info

2010-10-08 14:48:48 -07:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

am 9df14085: am 29332971: Merge "Add javadoc for display orientation." into gingerbread

2010-10-08 18:28:38 -07:00

inputmethodservice

resolved conflicts for merge of 2da9338c to master

2010-10-11 10:37:51 -07:00

net

Make fields in WebAddress private, add getters/setters

2010-10-13 16:21:01 +01:00

nfc

NFC API revision round 2.

2010-10-14 19:16:35 -07:00

os

am 2f98a585: am 49ec3dff: Merge "OBB: Change documentation to reflect reality" into gingerbread

2010-10-15 08:32:30 -07:00

pim

Refrain warning when not appropriate. Do not merge

2010-10-04 07:59:34 -07:00

preference

am ca1db5ae: am dd644c17: Fallback to SharedPreferences.commit() when no apply() exists.

2010-10-11 17:43:06 -07:00

provider

resolved conflicts for merge of c6bf3eaa to master

2010-10-15 11:20:42 -07:00

security

…

server

resolved conflicts for merge of bbb90d13 to master

2010-10-15 10:02:57 -07:00

service/wallpaper

Remove the unused UrlRendererService

2010-10-12 15:14:27 +01: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

Drag thumbnail fixes / improvements

2010-10-14 16:43:39 -07:00

webkit

am c7ee44cb: am dfc07279: Line up WebTextView text with the page.

2010-10-14 23:03:23 -07:00

widget

Fixing null pointer exception

2010-10-14 16:25:23 -07:00

package.html

…