Jean-Baptiste Queru 843ff92bb0 resolved conflicts for merge of 5d919b43 to gingerbread-plus-aosp ...

Change-Id: I8b8a8dfdd99052f3d43a0feb47168876b41e336d

2010-10-20 18:16:57 -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 74b1ed32: Fix issue #3113219: NativeActivity using wrong lib path with Java code

2010-10-20 13:56:03 -07:00

appwidget

merge from open-source master

2010-07-12 15:26:21 -07:00

bluetooth

am 2c1dab44: am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo

2010-10-15 18:23:34 -07:00

content

am fb2cd0aa: Merge "Fix java doc on FLAG_EXTERNAL." into gingerbread

2010-10-20 17:14:59 -07:00

database

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

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

ddm

…

debug

…

emoji

…

gesture

…

hardware

Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread

2010-10-20 09:34:24 -07: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

Added missing implementation for NdefRecord.

2010-10-18 19:09:26 -07:00

os

am 987e8d7f: Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread

2010-10-19 12:25:46 -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 d16f7588: Merge "DO NOT MERGE: Private API to pass the selected tab through QuickContacts" into gingerbread

2010-10-14 18:34:17 -07:00

security

…

server

am 8b525c07: Merge "Check for state before disconnecting." into gingerbread

2010-10-14 13:41:16 -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 c1a564b1: Merge "Add support for secure system overlays. (DO NOT MERGE)" into gingerbread

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

webkit

am 59993d9b: Merge "Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX" into gingerbread

2010-10-19 12:44:19 -07:00

widget

resolved conflicts for merge of 5d919b43 to gingerbread-plus-aosp

2010-10-20 18:16:57 -07:00

package.html

…