Philip P. Moltmann bd926258c2 resolve merge conflicts of 3c002e45dd to oc-dev-plus-aosp ...

am: d45000c1a9

Change-Id: I86966803e94f5e048d48898e7e43d15708c62254

2017-04-07 03:34:44 +00:00

..

accessibilityservice

…

accounts

…

animation

…

annotation

…

app

Merge "Revert "Handle case when snapshot dimensions don't match"" into oc-dev am: e7ac324c71

2017-04-06 22:35:27 +00:00

appwidget

…

bluetooth

…

companion

…

content

Merge "Allow permissions to be runtime-only." into oc-dev am: 941e9e2b38

2017-04-06 19:27:22 +00:00

database

…

ddm

…

debug

…

gesture

…

hardware

Merge "Camera: Initial support for vendor tag caches" into oc-dev am: a441da153e

2017-04-06 14:14:39 +00:00

inputmethodservice

…

metrics

…

net

…

nfc

…

os

Merge "Log excessive remote callbacks" into oc-dev

2017-04-07 03:06:50 +00:00

permissionpresenterservice

…

preference

…

print

Return inet addr for discoverable printers

2017-04-06 11:54:53 -07:00

printservice

Return inet addr for discoverable printers

2017-04-06 11:54:53 -07:00

provider

Clone BackupManagerService and make Trampoline aware of the clone.

2017-04-06 12:28:13 +01:00

security

…

service

Merge "Removed deprecated onFillRequest() method" into oc-dev am: 7a7c0ace82

2017-04-06 23:32:11 +00:00

speech

…

text

…

transition

…

util

…

view

Merge "Revise Accessibility button chooser intent/permissions" into oc-dev am: ecb5b5ccc3

2017-04-07 02:52:50 +00:00

webkit

Added onMovedToDisplay method to WebView

2017-04-06 15:50:05 -07:00

widget

Force direction of phone number fields to (practically) LTR

2017-04-06 19:42:57 +00:00

package.html

…