Jeff Sharkey df5f870d98 resolve merge conflicts of 07c6628d68 to master. ...

Change-Id: I29c9b408956c578ce1cfe0eb5d8704b7a5d2f818

2015-10-30 15:44:58 -07:00

..

accessibilityservice

…

accounts

Added --restricted option for create-user command

2015-09-28 10:01:54 -07:00

animation

Change wrong doc about using linear interpolator.

2015-10-16 10:47:57 -07:00

annotation

…

app

Merge "More granular reporting of size configurations."

2015-10-30 20:45:38 +00:00

appwidget

…

bluetooth

Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-dev am: 4636770f0d am: 3b6f9f78cf

2015-10-29 18:19:14 +00:00

content

resolve merge conflicts of 07c6628d68 to master.

2015-10-30 15:44:58 -07:00

database

…

ddm

Remove GLTrace support

2015-10-06 15:18:40 -07:00

debug

…

gesture

…

hardware

Fix javadoc for CameraManager.AvailabilityCallback

2015-10-26 08:56:45 -07:00

inputmethodservice

Fix crash in KeyboardView with null Handler

2015-10-23 14:27:40 +01:00

net

Also treat loss of IPv6 as a loss of provisioning.

2015-10-27 17:11:27 +09:00

nfc

Fix missing copyright headers.

2015-09-07 11:53:59 +02:00

os

Merge "Don't store a static instance of UserManager"

2015-10-30 18:19:08 +00:00

preference

am 3afdd417: am cad75a26: am 627bc805: am ae5a53d7: Merge "Update volume slider on device changed." into mnc-dr-dev

2015-10-15 14:05:16 +00:00

print

…

printservice

…

provider

Use preexisting DND access setting for condition providers.

2015-10-30 11:55:20 -04:00

security

Allow uid to be passed for more operations

2015-09-10 15:34:11 -07:00

service

Use preexisting DND access setting for condition providers.

2015-10-30 11:55:20 -04:00

speech

…

test

Suppress testAndroidTestCaseSetupProperly

2015-10-05 13:25:03 -07:00

text

Stop making a reversed selection with mice.

2015-10-27 17:26:07 +09:00

transition

Set the bounds on the drawable for ChangeBounds reparenting.

2015-10-19 23:42:38 +00:00

util

More granular reporting of size configurations.

2015-10-30 10:14:17 -07:00

view

Sending drag-start notifications to children added to view group.

2015-10-29 19:42:00 +00:00

webkit

Add new version of WebViewClient.shouldOverrideUrlLoading callback

2015-10-28 16:05:41 -07:00

widget

Implement new keyboard interaction model in TimePicker

2015-10-22 16:01:48 -04:00

package.html

…