Trevor Johns 682c24e228 Resolve merge conflicts of a5060ee to nyc-dev ...

This undoes the automerger skip which occured in
commit e740c84dc3 and
replays it as a standard (NOT -s ours) merge.

Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086

2016-04-19 02:03:59 -07:00

..

accessibilityservice

Treat accessibility gestures like physical ones.

2016-04-07 12:20:27 -07:00

accounts

introduce GET_PASSWORD_PRIVILEDGED permission.

2016-04-01 10:55:34 -07:00

animation

Implement transition for docking task in recents #6

2016-03-25 15:13:36 -07:00

annotation

…

app

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

appwidget

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

bluetooth

Allow factory reset when bluetooth is off (1/2)

2016-04-05 20:23:21 +00:00

content

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

database

Fix sqlite time measurement.

2016-04-07 09:42:17 -07:00

ddm

Send nativeDebuggable byte value as part of HELLO response.

2016-04-05 07:25:18 -07:00

debug

…

gesture

…

hardware

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

inputmethodservice

Customizes input extract edit view for Wear

2016-04-12 15:05:13 +00:00

net

Add implemention for isSameTrustConfiguration

2016-04-12 13:04:43 -07:00

nfc

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

os

Merge "Make getStorageVolume(File file) public." into nyc-dev

2016-04-12 20:44:06 +00:00

preference

Revert "Add Preference#onDetachedFromActivity"

2016-04-05 14:06:47 +00:00

print

Fix Print CTS tests.

2016-04-01 12:22:13 -07:00

printservice

Add the print service recommendation service

2016-03-30 17:21:07 -07:00

provider

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

security

Add implemention for isSameTrustConfiguration

2016-04-12 13:04:43 -07:00

service

Merge "Add granular control over disabled effects." into nyc-dev

2016-04-08 20:59:10 +00:00

speech

Use audio_session_t consistently

2016-03-10 10:35:49 -08:00

test

Deprecated platform Android testing APIs

2016-01-27 18:09:58 -08:00

text

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

transition

Disable suppressLayout in Visibility Activity Transitoins.

2016-03-22 13:41:57 -07:00

util

Fix Patterns.UCS_CHAR character class

2016-04-11 18:45:29 -07:00

view

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

webkit

Create WebViewUpdateServiceImpl to move implementation there.

2016-04-07 16:03:44 +01:00

widget

Merge "Include current selection mode in TimePicker event text" into nyc-dev

2016-04-12 21:18:15 +00:00

package.html

…