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

Merge commit 'e68f8b7ebe898ec06d7a156964d498e3d0a2e6c0'

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

2010-09-15 11:37:22 -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

Make fragment animations work when fragments go away

2010-09-10 17:43:04 -07:00

annotation

…

app

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

2010-09-15 07:08:49 -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 0522f5e9 to master

2010-09-13 14:57:59 -07:00

content

resolved conflicts for merge of 6421ae7e to master

2010-09-13 21:41:57 -07:00

database

change TAG value from "Cursor" to "SQLiteCursor"

2010-09-14 16:02:02 -07:00

ddm

…

debug

…

emoji

…

gesture

…

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 e68f8b7e: am 405d4db5: Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters

2010-09-15 11:37:22 -07:00

os

resolved conflicts for merge of 53686433 to master

2010-09-13 16:56:10 -07:00

pim

Fix again.

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

preference

Add a new "activated" state to View.

2010-09-15 11:00:44 -07:00

provider

Add per network static IP settings

2010-09-14 16:15:22 -07:00

security

…

server

am b390728b: am a224f70b: Fix interaction between BluetoothEventLoop and BluetoothService.

2010-09-15 07:07:38 -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

resolved conflicts for merge of 171c83f4 to master

2010-09-12 13:55:18 -07:00

util

am 75f0024c: am 6e86915e: Merge "Fixes to battery stats debug output." into gingerbread

2010-09-07 15:16:38 -07:00

view

Add a new "activated" state to View.

2010-09-15 11:00:44 -07:00

webkit

Exit action mode when destroying the WebView or loading.

2010-09-15 11:43:49 -04:00

webruntime

…

widget

Add a new "activated" state to View.

2010-09-15 11:00:44 -07:00

package.html

…