Adam Powell 3c09ba3f79 resolved conflicts for merge of 06fd1dc5 to gingerbread-plus-aosp ...

Change-Id: Iae11cabdc3c6b6b59dfdcc3b4944088dded91a52

2010-11-08 19:21:58 -08: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 9df48a03: Merge "NotificationManager: droiddoc documentation improvements"

2010-11-02 15:00:06 -07:00

appwidget

…

bluetooth

am 025f78eb: Merge "DO NOT MERGE Fix auto connection with headsets which don\'t send incoming connections for all profiles." into gingerbread

2010-10-27 23:44:02 -07:00

content

am b1fa549a: Merge "Fixes Issue 7907 in the public bugs database (http://code.google.com/p/android/issues/detail?id=7907)."

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

database

am bbd212d7: Merge "Document per-implementation behaviors of native get* methods"

2010-11-02 14:18:07 -07:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

Camera.open() should only return back-facing camera.

2010-11-09 02:20:02 +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

Remove the My Tag feature.

2010-11-03 15:32:40 -05:00

os

am 38993d8d: Merge "Fix issue #3122240: Expose xlarge in GB." into gingerbread

2010-10-22 14:03:08 -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 7ea5c45e: NFC settings cleanup.

2010-10-21 09:38:15 -07:00

security

…

server

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

2010-10-14 13:41:16 -07:00

service

Report the new size to wallpapers when the requested size changed.

2010-10-28 18:04:10 -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

Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE

2010-10-21 15:32:06 -07:00

view

am 26153a33: Fix bug 3163052 - always use 32-bit drawing caches when destination window is 32-bit

2010-11-08 18:35:22 -08:00

webkit

Merge db2403ff from open-source master

2010-11-05 07:53:24 -07:00

widget

resolved conflicts for merge of 06fd1dc5 to gingerbread-plus-aosp

2010-11-08 19:21:58 -08:00

package.html

…