Jean-Baptiste Queru 89fbcd72fb resolved conflicts for merge of c2894474 to gingerbread-plus-aosp ...

Change-Id: Ie00785e37809b677d6e8ab44c47e1f26037793d2

2010-10-10 17:45:45 -07:00

..

accessibilityservice

…

accounts

am b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo

2010-08-06 18:55:05 -07:00

annotation

…

app

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

2010-10-10 15:54:26 -07:00

appwidget

merge from open-source master

2010-07-12 15:26:21 -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 dd644c17: Fallback to SharedPreferences.commit() when no apply() exists.

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

database

am 32e60c79: Update StrictMode\'s public API.

2010-10-01 13:05:02 -07:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

Add javadoc for display orientation.

2010-10-07 19:41:23 +08:00

inputmethodservice

Made paste work in ExtractEditText

2010-10-08 18:23:49 -07:00

net

am 3ed792d5: Merge "Don\'t perform DNS lookup in android.net.Proxy.isLocalHost"

2010-10-10 11:49:43 -07:00

nfc

New API stubs: NdefMessage and NdefRecord.

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

os

resolved conflicts for merge of c2894474 to gingerbread-plus-aosp

2010-10-10 17:45:45 -07:00

pim

Refrain warning when not appropriate. Do not merge

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

preference

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

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

provider

am cdcc0a65: Merge "Have download manager give more details when downloads are paused" into gingerbread

2010-09-30 11:42:16 -07:00

security

…

server

resolved conflicts for merge of 0a972acf to gingerbread-plus-aosp

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

service

Force wallpaper surface to 565.

2010-09-08 16:32:27 -07:00

speech

Fix NPE in TextToSpeech with setLanguage(null)

2010-07-26 16:11:58 -07:00

test

…

text

am 14a288da: Merge "Add suuport for splitting touch events across windows." into gingerbread

2010-09-27 12:37:03 -07:00

util

b/3054044 Make allDay event times format in utc

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

view

am 1e6a3a53: Merge "Added more robust tracking and cancelation of events." into gingerbread

2010-10-10 14:50:38 -07:00

webkit

am 59c4cb9e: Merge "DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll" into gingerbread

2010-10-05 16:46:05 -07:00

widget

am b72a335a: Merge "Voice input replaces selected text." into gingerbread

2010-10-10 14:04:25 -07:00

package.html

…