Dianne Hackborn f41d25a2f5 resolved conflicts for merge of 8bb779bd to master ...

Change-Id: I72ddc0a67cf55d45958a622ffe535f32c1721052

2012-09-12 10:55:03 -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 "Report the user id of every app to ddms." into jb-mr1-dev

2012-09-10 15:59:36 -07:00

appwidget

am 51740d6d: am 0e9f34bf: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link

2012-09-10 16:27:20 -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

More multi-user methods in PM

2012-09-08 19:14:00 -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

Improve Wifi display discovery API.

2012-09-08 23:15:00 -07:00

inputmethodservice

IME support for trackball and generic motion events

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

net

Merge "Fix DHCP handling at disconnect/reconnect" into jb-mr1-dev

2012-08-29 15:55:43 -07:00

nfc

Fix NPE in NdefRecord parser.

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

os

USER_CURRENT_OR_SELF had the same int as USER_CURRENT!

2012-09-10 15:37:53 -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

DreamManagerService: Handle missing db value

2012-08-25 09:51:40 -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

Animations for user switching.

2012-09-10 19:58:21 -07:00

webkit

am d2d3bff2: am befab9e6: Merge "Control access to inherited methods of jsinterface objects" into jb-mr1-dev

2012-09-10 18:21:14 -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

…