nharold 4e793fd0b5 Merge changes from topic "ipsec-svc-cleanup" am: 9778c7884f ...

am: ae61e0c6e8

Change-Id: If8803e2fc98adb2f08a5bf2944fc60d0f0e71acd

2017-10-04 20:35:20 +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

…

backup

Reintroduce the contract for random token to be non-negative

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

companion

…

core

Merge changes from topic "ipsec-svc-cleanup" am: 9778c7884f

2017-10-04 20:35:20 +00:00

coverage

…

devicepolicy

Merge "DPC should not be allowed to grant development permission" into oc-dev

2017-09-11 03:41:57 +00:00

java/com/android/server

Re-Enable Starting of the IpSecService

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

midi

…

net

Change BlockingSocketReader to use MessageQueue fd handling

2017-09-28 18:22:40 +09: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