Jeff Sharkey 116be95495 Merge commit '81eb7640' into mergeit ...

Conflicts:
	core/java/android/app/ActivityThread.java

Change-Id: I7bb19741ae948e4570c0882dee2558dd5ff2c350

2012-09-12 16:34:31 -07:00

..

accessibilityservice

Adding FEEDBACK_BRAILLE to AccessibilityServiceInfo.

2012-09-06 19:40:34 -07:00

accounts

Merge "Fix docs typo: startActivityWithResult should be startActivityForResult."

2012-09-05 08:14:03 -07:00

animation

Fix clone() for Animators with just a 'to' value

2012-09-10 13:42:07 -07:00

annotation

…

app

Merge commit '81eb7640' into mergeit

2012-09-12 16:34:31 -07:00

appwidget

Adding notion of keyguard widgets

2012-09-11 10:53:57 -07:00

bluetooth

Merge "Turn off verbose debug message in BluetoothAdapter Change-Id: I30245ab911b5428f7af38f195b941db02d36b18f" into jb-mr1-dev

2012-08-29 16:30:14 -07:00

content

Include user identifier in external storage paths.

2012-09-11 23:11:14 -07:00

database

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

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

ddm

Report the user id of every app to ddms.

2012-09-10 14:44:38 -07:00

debug

…

emoji

…

gesture

…

hardware

Merge "NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR" into jb-mr1-dev

2012-09-11 12:41:11 -07:00

inputmethodservice

IME support for trackball and generic motion events

2012-09-10 14:01:42 -07:00

net

am 5d33e76c: am 65208857: am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags"

2012-09-11 15:09:11 -07:00

nfc

Fix NPE in NdefRecord parser.

2012-09-06 17:13:38 +02:00

os

Include user identifier in external storage paths.

2012-09-11 23:11:14 -07:00

preference

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

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

provider

Miscellaneous fixes for Settings

2012-09-10 17:32:39 -07:00

server

Enforce permissions for calls with specified userId

2012-08-30 16:08:23 -07:00

service

Update the dream manager to be multi-user aware.

2012-09-11 09:50:23 -04:00

speech

Fix threading issue in BlockingAudioTrack.

2012-08-28 02:19:20 -07:00

test

Show more info when a testcase fails.

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

text

Fix Time.parse and Time.parse3339 crashing bugs. DO NOT MERGE

2012-09-07 12:42:18 -07:00

util

Let Pair represent null values.

2012-09-06 23:05:11 -07:00

view

Merge "Screen magnifier should handle window rebuilds correctly." into jb-mr1-dev

2012-09-11 15:52:33 -07:00

webkit

am 77f02ca9: am 79ccb1e8: Merge "Deleting the defunct SearchBox interface." into jb-mr1-dev

2012-09-12 15:28:53 -07:00

widget

am ef94c988: am 1434e29a: Merge "Check for null ViewRootImpl when saving accessibility focus in ListView." into jb-mr1-dev

2012-09-10 17:14:58 -07:00

package.html

…