Dianne Hackborn a1b0d6966e resolved conflicts for merge of efa4f7f8 to master ...

Change-Id: I00dff76594326a6f6e69515a9cba673602ed269d

2010-10-08 11:09:38 -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

New TimeInterpolator interface for android.animation package.

2010-10-07 12:27:06 -07:00

annotation

…

app

resolved conflicts for merge of efa4f7f8 to master

2010-10-08 11:09:38 -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

Add getCurrentSyncs() to the SDK, which replaces the deprecated

2010-10-08 09:50:45 -07:00

database

STOPSHIP - add illegalStateException to catch potential deadlocks in db

2010-10-05 10:50:45 -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

Add LinkAddress

2010-10-06 11:04:05 -07:00

nfc

New API stubs: NdefMessage and NdefRecord.

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

os

Merge "Add extra to ACTION_BATTERY_CHANGED to indicate an invalid charger is attached."

2010-10-07 10:52:30 -07:00

pim

Refrain warning when not appropriate. Do not merge

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

preference

Adding next/prev to fragment animations and to PreferenceActivity

2010-10-05 15:13:24 -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

New TimeInterpolator interface for android.animation package.

2010-10-07 12:27:06 -07:00

webkit

Fix NPE in addMessageToConsole.

2010-10-08 10:06:07 -04:00

widget

resolved conflicts for merge of ba04dbc6 to master

2010-10-07 20:46:03 -07:00

package.html

…