Irfan Sheriff 749728e391 Merge commit '949dcad8' into manualmerge ...

Conflicts:
	services/java/com/android/server/ConnectivityService.java

Change-Id: I02fee6839c2a8879fb6e885d8fc8483f17d655c2

2012-08-27 23:03:50 -07:00

..

accessibilityservice

misc doc bugs.

2012-08-06 15:43:01 -07:00

accounts

Switch public APIs to use new UserHandle class for identifying users.

2012-08-17 10:36:08 -07:00

animation

Make animators more robust against ending mid-stream

2012-08-16 14:34:04 -07:00

annotation

Add tools specific annotations to the API.

2012-01-31 15:56:40 -08:00

app

Merge "Add setOnDismissListener to AlertDialog.Builder" into jb-mr1-dev

2012-08-27 14:04:29 -07:00

appwidget

Update AppWidgetHost with better support for OnClickHandlers

2012-08-20 15:44:05 -07:00

bluetooth

Captive portal handling

2012-08-27 22:27:06 -07:00

content

Some clean up of app install and user management.

2012-08-24 18:00:37 -07:00

database

am 64ed6b2c: am d77d17c2: Merge "Fix cursor memory leak"

2012-08-08 10:55:46 -07:00

ddm

…

debug

…

emoji

Fix obvious typos under frameworks/base/core

2012-03-09 22:48:43 +09:00

gesture

…

hardware

Clean up displayId and layerStack usage.

2012-08-23 08:43:54 -07:00

inputmethodservice

Refactor for multi-display support.

2012-08-19 22:42:08 -07:00

net

Captive portal handling

2012-08-27 22:27:06 -07:00

nfc

Fix several cases of broken droiddoc syntax

2012-07-25 10:49:25 -07:00

os

Make it easier to create asynchronous Handlers.

2012-08-25 13:40:26 -07:00

preference

Don't assume a default of 'false' for TwoStatePreference

2012-08-10 14:36:53 -07:00

provider

Captive portal handling

2012-08-27 22:27:06 -07:00

server

Rename UserId to UserHandle.

2012-08-16 12:46:38 -07:00

service

DreamManagerService: Handle missing db value

2012-08-25 09:51:40 -04:00

speech

Fix double call to TTS connection disconnect() on reconnect

2012-08-20 08:56:39 -07:00

test

Show more info when a testcase fails.

2012-08-06 13:54:05 -07:00

text

am 737e99d8: am e45ca31a: am aae49432: am 4763989d: am 32d1fec5: Merge "Fixes relative time formatting issue for dates in future"

2012-08-27 13:16:13 -07:00

util

Add FloatMath.pow.

2012-08-21 22:27:41 -07:00

view

Fix improper use of CloseGuard.

2012-08-27 14:34:55 -07:00

webkit

am 12d8776b: am f9202718: Merge "Protect against focus changes after .destroy()" into jb-mr1-dev

2012-08-27 16:59:34 -07:00

widget

Merge "Fix again bug #6887370 ListPreference shows misaligned radio drawables (in CheckedTextView?)" into jb-mr1-dev

2012-08-24 16:11:19 -07:00

package.html

…