Dianne Hackborn 4e1fa3c476 resolve merge conflicts of a14aac9 to master ...

Change-Id: If92c42a9e6fbc3cccd24fa2677f0e4c34d65c923

2016-05-04 16:53:38 -07:00

..

accessibilityservice

Merge "Fix several accessibility magnification issues." into nyc-dev

2016-04-27 22:50:37 +00:00

accounts

…

animation

Evaluate ARGB values in linear space instead of sRGB

2016-04-29 15:52:57 -07:00

annotation

…

app

Merge "Merge "Merge "Make sure to pause activity before stopping" into nyc-dev am: 5f81a3f84c" into nyc-mr1-dev am: 75179ada54" into nyc-mr1-dev-plus-aosp

2016-05-04 22:09:41 +00:00

appwidget

…

bluetooth

…

content

Merge "Merge "ShortcutManaegr: bug fixes" into nyc-mr1-dev am: 5b9d876ef5" into nyc-mr1-dev-plus-aosp

2016-05-04 22:09:57 +00:00

database

…

ddm

…

debug

…

gesture

…

hardware

Merge "Fixes on handling messages from apps to host." into nyc-dev

2016-04-29 19:24:18 +00:00

inputmethodservice

Fix a behavior change in "Show software keyboard".

2016-05-04 11:56:35 -07:00

net

Merge "Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: 7ec93a1ee2 am: 78d0888e8c" into nyc-mr1-dev-plus-aosp

2016-05-04 22:04:40 +00:00

nfc

Merge "Fix API review comments, add remove callback." into nyc-dev

2016-04-28 05:43:17 +00:00

os

resolve merge conflicts of a14aac9 to master

2016-05-04 16:53:38 -07:00

permissionpresenterservice

Cleanup of the PackageInstaller API - Frameworks

2016-04-22 14:18:32 -07:00

preference

…

print

Rename 'thousands of an inch' to 'thousandths of an inch'in the docs.

2016-04-21 16:29:43 -07:00

printservice

…

provider

Merge "Update BlockedNumberContract documentation." into nyc-dev am: 9a2384a7a6

2016-05-04 21:40:04 +00:00

security

…

service

Merge "copy auto-group decisions to updates" into nyc-dev am: facdf19313

2016-05-03 20:15:37 +00:00

speech

…

test

…

text

Make LocaleList constructor non-nullable

2016-05-02 12:57:56 -07:00

transition

…

util

Merge "Make LocaleList constructor non-nullable" into nyc-dev am: 4d826831b5 am: c29bc443f8

2016-05-03 00:38:48 +00:00

view

Merge "Fix View leakage from mPreSortedChildren" into nyc-dev am: 4e34cd0537 am: 2f66d0a849

2016-05-04 22:55:37 +00:00

webkit

Nicer rethrowing of RemoteExceptions from WebViewUpdateService

2016-05-04 14:32:31 +00:00

widget

Merge "Show drag handles after finishing batch edit if needed." into nyc-dev am: be1cd9f5ce am: 5496ec1875

2016-05-04 00:44:30 +00:00

package.html

…