Doris Liu 9d5c93f407 resolve merge conflicts of 0e89f98 to nyc-dev-plus-aosp ...

Change-Id: Ifa9dea0e4a0337c24dad899a10b5def46679742c

2016-04-08 13:31:42 -07:00

..

accessibilityservice

Treat accessibility gestures like physical ones.

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

accounts

Merge "introduce GET_PASSWORD_PRIVILEDGED permission." into nyc-dev

2016-04-01 20:08:58 +00:00

animation

Implement transition for docking task in recents #6

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

annotation

…

app

Merge "Throw security exception for non-parent aware APIs" into nyc-dev

2016-04-08 12:08:47 +00:00

appwidget

Changing startListening to only fetch views which are bound

2016-04-04 14:45:14 -07:00

bluetooth

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

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

content

Merge "Hide unnecessary extra name constants in ClipDescription" into nyc-dev

2016-04-07 22:21:45 +00: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

Delete all work fingerprints when unified lock changes to None/Swipe

2016-04-07 15:40:54 +00:00

inputmethodservice

Fix a regression in SHOW_IME_WITH_HARD_KEYBOARD handling.

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

net

Merge "Internal API for system apps to determine default network for other apps" into nyc-dev

2016-04-07 16:43:15 +00:00

nfc

…

os

Merge "batteryService: Add Charge Counter." into nyc-dev

2016-04-08 01:09:24 +00:00

preference

Revert "Add Preference#onDetachedFromActivity"

2016-04-05 14:13:32 +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

Put disallow-safe-boot restriction to system settings

2016-04-06 19:11:23 +02:00

security

Use X509ExtendedTrustManagers

2016-03-28 10:48:41 -07:00

service

add an onListenerDisconnected() callback to NLS

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

speech

…

test

…

text

Apply correct bottom padding to layouts

2016-04-04 12:34:06 -07:00

transition

Disable suppressLayout in Visibility Activity Transitoins.

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

util

Improve error logging for parsing failures

2016-04-08 18:01:54 +00:00

view

Merge "Make stopped state a first-class thing" into nyc-dev

2016-04-08 15:17:03 +00:00

webkit

Create WebViewUpdateServiceImpl to move implementation there.

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

widget

Merge "Fix suggestion popup for RTL text on LTR layout." into nyc-dev

2016-04-07 09:20:27 +00:00

package.html

…