Makoto Onuki 2a99cbb96f Merge "Don't cancel by UID when an app is disabled or uninstalled" ...

am: 36d606c86d

Change-Id: Ib0a9eb74f7b31a644472631c10d3a0f1604d8033

2017-09-28 16:36:15 +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 "Don't cancel by UID when an app is disabled or uninstalled"

2017-09-28 16:36:15 +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

Support NAT keepalives

2017-09-08 10:54:20 +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