Jean-Baptiste Queru 9c9430b30f resolved conflicts for merge of e69f1f1a to master ...

Change-Id: I32b34e4f6ae83ff40398c6e9e2881af12abc4aa8

2010-10-12 09:23:10 -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

Double the performance of animations.

2010-10-11 08:47:13 -07:00

annotation

…

app

am a23964f9: am b8f7a483: Merge "bug:3082865 don\'t use IN to construct sql to delete downloads" into gingerbread

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

appwidget

Adding callback and fix to RemoteViewsFactory on notifyDataSetChanged.

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

bluetooth

am 38702d5f: Merge "DO NOT MERGE: Disconnect PBAP while disconnecting HFP profile." into gingerbread

2010-10-07 16:58:13 -07:00

content

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

2010-10-11 17:43:06 -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

resolved conflicts for merge of b3ffd4ad to master

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

nfc

New API stubs: NdefMessage and NdefRecord.

2010-10-04 17:56:23 -07:00

os

am 89fbcd72: resolved conflicts for merge of c2894474 to gingerbread-plus-aosp

2010-10-11 17:49:42 -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 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

Merge "Fix an event injection bug when the policy is bypassed."

2010-10-11 18:15:38 -07:00

webkit

resolved conflicts for merge of e69f1f1a to master

2010-10-12 09:23:10 -07:00

widget

Add an API to control AbsListView's friction.

2010-10-11 19:38:37 -07:00

package.html

…