Ben Schwartz 3017ebec8c Merge "Add a global setting to disable DNS over TLS" ...

am: 4a906c167b

Change-Id: Ie0f5586342b32c9e7c745ab9697b44158a920233

2017-10-20 15:08:55 +00:00

..

accessibility

Merge "IllegalArgumentException in MagnificationGestureHandler"

2017-08-30 20:57:27 +00:00

appwidget

Add checking values not to save illegal value to appwidgets.xml

2017-09-19 16:27:24 +09:00

autofill

Avoid a race in autofill manager service.

2017-07-05 19:26:37 +00:00

backup

Reintroduce the contract for random token to be non-negative

2017-07-27 16:02:15 +00:00

companion

…

core

Merge "Add a global setting to disable DNS over TLS"

2017-10-20 15:08:55 +00:00

coverage

…

devicepolicy

Add settings and reset operations for demo users

2017-08-09 19:18:20 -07:00

java/com/android/server

Re-Enable Starting of the IpSecService

2017-09-26 22:11:58 +00:00

midi

…

net

Merge changes I3b56e75d,I36255a2c

2017-10-20 02:29:41 +00:00

print

…

restrictions

…

tests

resolve merge conflicts of 83c367aa5b to stage-aosp-master

2017-09-20 13:43:28 +01:00

usage

…

usb

Merge "Reword analog audio not supported notification" into oc-dr1-dev

2017-08-01 18:51:53 +00:00

voiceinteraction

…

Android.mk

Merge "fingerprint: remove use of -static hidl java" into stage-aosp-master am: 5de8c0ee40

2017-08-02 18:12:18 +00:00

profile-classes

DO NOT MERGE - Remove RetailDemoModeServiceInternal

2017-07-25 21:16:29 +00:00