Brian Carlstrom e68f8b7ebe am 405d4db5: Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters ...

Merge commit '405d4db50b3db1fc5e015475218e190d193332d4' into gingerbread-plus-aosp

* commit '405d4db50b3db1fc5e015475218e190d193332d4':
  Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters

2010-09-14 11:29:57 -07:00

..

accessibilityservice

Fix for bug 2448479

2010-02-17 16:46:42 -08:00

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

Add Annotation for optional features.

2009-12-14 17:52:20 -08:00

app

am 901b7b9b: am ca8f3d04: Merge "Add an option to hide the Voice Search icon." into froyo

2010-09-14 10:26:44 -07:00

appwidget

merge from open-source master

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

bluetooth

am cc5494c9: Out Of Band API for Secure Simple Pairing.

2010-09-13 11:52:19 -07:00

content

am 5251c800: Merge "Fix potential crash in sync." into gingerbread

2010-09-13 17:26:34 -07:00

database

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

2010-08-20 18:19:03 -07:00

ddm

Added dumpHprofDataDdms() call.

2010-01-29 13:29:51 -08:00

debug

…

emoji

…

gesture

Prevent possible NPE in android.gesture.Learner

2010-02-17 10:04:39 -08:00

hardware

Quell annoying Java ascii/unicode warning.

2010-09-06 19:22:09 -07:00

inputmethodservice

Made text selection work in ExtractEditText. DO NOT MERGE

2010-09-07 18:07:30 -07:00

net

am 405d4db5: Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters

2010-09-14 11:29:57 -07:00

os

am 7e9f4eb2: Track client requests through location manager.

2010-09-13 14:34:22 -07:00

pim

Fix again.

2010-09-02 13:48:09 -07:00

preference

am a2f2141c: Merge "More SharedPreferences commit() -> apply() changes." into gingerbread

2010-09-03 12:49:44 -07:00

provider

am 90fb15a7: Support UI visibility and restarting in download manager.

2010-09-12 19:11:08 -07:00

security

…

server

am a224f70b: Fix interaction between BluetoothEventLoop and BluetoothService.

2010-09-14 09:43:31 -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

New test on ContextMenuInfo packed positions.

2010-02-25 13:46:50 -08:00

text

am 11fe181e: Add faster TextUtil function for searching delimited lists.

2010-09-12 11:03:48 -07:00

util

Fixes to battery stats debug output.

2010-09-07 14:09:36 -07:00

view

am b07c0789: Merge "DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue" into gingerbread

2010-09-13 16:11:55 -07:00

webkit

am fbd26467: Merge "DO NOT MERGE" into gingerbread

2010-09-13 11:51:55 -07:00

widget

am ca6de93a: Merge "Fix number counter will keep going after window losed focus."

2010-09-10 16:39:35 -07:00

package.html

…